diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 422e75e..1e5f78a 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 projectname="Gun Run" saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-02T11:50:54">
+<qgis projectname="Gun Run" version="3.32.2-Lima" saveUser="tim" saveUserFull="Timothy Allen" saveDateTime="2023-09-02T20:10:14">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,226 +17,226 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer hillshading-z-factor="1" edl-distance="0.5" light-altitude="45" combined-method="0" edl-is-active="1" edl-strength="1000" hillshading-is-active="0" hillshading-is-multidirectional="0" edl-distance-unit="0" is-active="0" light-azimuth="315"/>
+  <elevation-shading-renderer light-altitude="45" edl-strength="1000" light-azimuth="315" edl-is-active="1" is-active="0" hillshading-z-factor="1" combined-method="0" hillshading-is-active="0" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="1" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [456]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="marshal_positions [456]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="extra_security20170921130834191" name="extra_security" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="extra_security20170921130834191" name="extra_security" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="marshals_by_position20161003112326575" name="marshals_by_position" legend_exp="" providerKey="delimitedtext">
+      <layer-tree-layer id="marshals_by_position20161003112326575" name="marshals_by_position" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="delimitedtext" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position [457]" name="cached_name" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="cached_name" type="QString" value="marshals_by_position [457]"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" name="cached_name" type="QString"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" type="QString" value="fencing"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" 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" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" 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" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)&amp;uid={cdc3d1cc-0fee-4cd6-8469-fbf7aeabfb6a}" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" legend_exp="" providerKey="memory">
+        <layer-tree-layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="memory" 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(5,0)&amp;uid={1822253a-3add-4fa0-95bb-001bacff6a53}" patch_size="-1,-1" checked="Qt::Checked">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="all_routes"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer 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" expanded="0" legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" legend_exp="" providerKey="ogr">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" 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" checked="Qt::Unchecked">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" name="cached_name" type="QString"/>
+          <Option name="cached_name" type="QString" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="water_tables20170921142016467" name="water_tables" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="water_tables20170921142016467" name="water_tables" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="water_tables"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="poi_labels" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="directions_to_start" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="mayor" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="viplabels" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="viplabels"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="vipaccess"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="residents_access_roads"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" expanded="0" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="osm_roads [3887]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="osm_places [7]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="1" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -244,34 +244,34 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Map">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" providerKey="gdal">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="GDAL-City of Cape Town 2015 Aerial"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" legend_exp="" providerKey="wms">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="wms" 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" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="Outlines"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
@@ -306,43 +306,43 @@
       <item>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" minScale="0" scaleDependencyMode="0" self-snapping="1" intersection-snapping="1" mode="3" maxScale="0" type="1" enabled="0">
+  <snapping-settings tolerance="10" minScale="0" unit="1" self-snapping="1" intersection-snapping="1" maxScale="0" type="1" mode="3" scaleDependencyMode="0" enabled="0">
     <individual-layer-settings>
-      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" units="1" enabled="1"/>
-      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" maxScale="0" type="2" units="2" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" maxScale="0" type="2" units="2" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" units="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" units="2" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" maxScale="0" type="0" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" maxScale="0" type="2" enabled="1"/>
+      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" units="2" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" maxScale="0" type="0" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" maxScale="0" type="1" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.41036315331831119</xmin>
-      <ymin>-33.91820021920908346</ymin>
-      <xmax>18.42813800762752052</xmax>
-      <ymax>-33.89691320746838699</ymax>
+      <xmin>18.3914523532156764</xmin>
+      <ymin>-33.93871522874037794</ymin>
+      <xmax>18.42700206183409506</xmax>
+      <ymax>-33.896141205258985</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -363,166 +363,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="marshal_positions">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="marshal_overviews" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="fencing">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="cone_only_groups">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="cone_only_groups" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="fence_and_cone_groups">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_and_cone_groups" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="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 showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="route_markers">
-          <filegroup open="true" hidden="false">
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+          <filegroup hidden="false" open="true">
             <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="all_routes">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <filegroup hidden="false" open="false">
         <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
+      <legendlayer name="water_tables" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="mayor">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer showFeatureCount="1" open="false" checked="Qt::Checked" drawingOrder="-1" name="osm_roads">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="osm_places">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" minScale="0" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyMessage="">
+  <main-annotation-layer legendPlaceholderImage="" minScale="0" refreshOnNotifyMessage="" maxScale="0" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -583,7 +583,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" type="raster" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -649,7 +649,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -660,9 +660,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -674,97 +674,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zscale="1" zoffset="0" band="1" enabled="0">
+      <elevation zoffset="0" band="1" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" enabled="1">
+            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" enabled="1">
+            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -773,28 +773,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer alphaBand="-1" redBand="1" opacity="0.5" blueBand="3" type="multibandcolor" greenBand="2" nodataColor="">
+        <rasterrenderer nodataColor="" greenBand="2" type="multibandcolor" opacity="0.5" alphaBand="-1" blueBand="3" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -805,14 +805,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" saturation="0" invertColors="0" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="0" type="raster" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -878,7 +878,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -889,7 +889,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -901,97 +901,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zscale="1" zoffset="0" band="1" enabled="0">
+      <elevation zoffset="0" band="1" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" enabled="1">
+            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" enabled="1">
+            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1000,28 +1000,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer alphaBand="-1" opacity="0.75" band="1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer nodataColor="" band="1" type="singlebandcolordata" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1032,14 +1032,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" saturation="0" invertColors="0" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1105,7 +1105,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="EPSG:4326" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="EPSG:4326" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1119,8 +1119,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="$length * 100" comment="" length="-1" typeName="double precision" subType="0" name="length_km" precision="0" type="6"/>
-        <field expression="$length * 100 * 1000" comment="" length="-1" typeName="double precision" subType="0" name="length_m" precision="0" type="6"/>
+        <field length="-1" comment="" expression="$length * 100" name="length_km" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1133,264 +1133,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="RouteLen" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="RouteLen" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" enabled="1">
+            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" enabled="1">
+            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" enabled="1">
+            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Show by day" symbol="0" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule label="21KM" symbol="1" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
-            <rule label="10KM" symbol="2" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
-            <rule label="5KM" symbol="3" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'"/>
-            <rule label="Trail" symbol="4" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" symbol="0" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="1" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="2" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" symbol="3" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="4" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule label="Always show" symbol="5" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0"/>
-          <rule label="Always show by day" symbol="6" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule symbol="5" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="6" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" enabled="1">
+            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" enabled="1">
+                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@0@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" enabled="1">
+                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1398,308 +1398,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" enabled="1">
+            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" enabled="1">
+            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" enabled="1">
+                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" enabled="1">
+            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" enabled="1">
+                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{d9268524-45f1-4731-945d-c43780c8de62}" enabled="1">
+            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" enabled="1">
+                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" enabled="1">
+                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1707,308 +1707,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" enabled="1">
+            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" enabled="1">
+            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" enabled="1">
+                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" enabled="1">
+            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" enabled="1">
+                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" enabled="1">
+            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" enabled="1">
+                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" enabled="1">
+                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2016,308 +2016,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" enabled="1">
+            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" enabled="1">
+            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" enabled="1">
+                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" enabled="1">
+            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" enabled="1">
+                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" enabled="1">
+            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" enabled="1">
+                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@3@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" enabled="1">
+                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2325,308 +2325,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" enabled="1">
+            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}" enabled="1">
+            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" enabled="1">
+                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" enabled="1">
+            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" enabled="1">
+                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" enabled="1">
+            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" enabled="1">
+                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@4@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" enabled="1">
+                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2634,641 +2634,641 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" enabled="1">
+            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" enabled="1">
+            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" enabled="1">
+                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" enabled="1">
+            <layer id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" enabled="1">
+                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" enabled="1">
+            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="6" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="6" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" enabled="1">
+            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{e842cde3-5fe8-446f-9366-05d25752d7e6}">
-          <rule description="Active routes" key="{740dbf42-b3b1-4282-b431-9154d8807416}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{740dbf42-b3b1-4282-b431-9154d8807416}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="round($length / 1000, 0)" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="km_marker()" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="km_marker()" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="1" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Route lengths" key="{28afd8b9-3b2a-4198-bb1f-b81ba61c7434}" active="0">
+          <rule description="Route lengths" active="0" key="{28afd8b9-3b2a-4198-bb1f-b81ba61c7434}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="round( $length * 100, 4 )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="km_marker()" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="50" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapAtNoCost" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="km_marker()" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="50" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapAtNoCost" priority="10" dist="2" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3277,21 +3277,21 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -3299,54 +3299,54 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{99bd229d-7319-436f-b616-1be11812c381}" enabled="1">
+              <layer id="{99bd229d-7319-436f-b616-1be11812c381}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3354,12 +3354,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3367,137 +3367,137 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3514,69 +3514,69 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
       </constraints>
       <constraintExpressions>
-        <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 exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="$length * 100" comment="" length="-1" typeName="double precision" subType="0" name="length_km" precision="0" type="6"/>
-        <field expression="$length * 100 * 1000" comment="" length="-1" typeName="double precision" subType="0" name="length_m" precision="0" type="6"/>
+        <field length="-1" comment="" expression="$length * 100" name="length_km" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Sort&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Sort&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="121" name="Name" type="field"/>
-          <column hidden="0" width="31" name="descriptio" type="field"/>
-          <column hidden="0" width="31" name="timestamp" type="field"/>
-          <column hidden="0" width="141" name="begin" type="field"/>
-          <column hidden="0" width="31" name="end" type="field"/>
-          <column hidden="0" width="66" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="39" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="188" name="length_m" type="field"/>
-          <column hidden="0" width="31" name="Sort" type="field"/>
-          <column hidden="0" width="31" name="day" type="field"/>
-          <column hidden="0" width="266" name="length_km" type="field"/>
+          <column width="121" name="Name" hidden="0" type="field"/>
+          <column width="31" name="descriptio" hidden="0" type="field"/>
+          <column width="31" name="timestamp" hidden="0" type="field"/>
+          <column width="141" name="begin" hidden="0" type="field"/>
+          <column width="31" name="end" hidden="0" type="field"/>
+          <column width="66" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="39" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="188" name="length_m" hidden="0" type="field"/>
+          <column width="31" name="Sort" hidden="0" type="field"/>
+          <column width="31" name="day" hidden="0" type="field"/>
+          <column width="266" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3608,53 +3608,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3728,189 +3728,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" enabled="1">
+            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" enabled="1">
+            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{53b6bbaf-4722-434f-a142-936b95477967}" enabled="1">
+            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" enabled="1">
+            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="183,72,75,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3921,9 +3921,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -3933,24 +3933,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -3959,9 +3959,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy field="ID" policy="Duplicate"/>
@@ -3969,25 +3969,25 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="ID"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="height"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint exp="" desc="" field="ID"/>
+        <constraint exp="" desc="" field="height"/>
+        <constraint exp="" desc="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4010,18 +4010,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89686895033258196</ymax>
+        <ymax>-33.89694611440350513</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89686895033258196</ymax>
+        <ymax>-33.89694611440350513</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -4086,173 +4086,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" enabled="1">
+            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" enabled="1">
+            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" enabled="1">
+            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" enabled="1">
+            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4263,9 +4263,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -4273,35 +4273,35 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -4310,10 +4310,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -4322,28 +4322,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4366,7 +4366,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4442,173 +4442,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" enabled="1">
+            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" enabled="1">
+            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" enabled="1">
+            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" enabled="1">
+            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="38,162,105,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="f_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4619,13 +4619,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -4633,54 +4633,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="1" spacing="5" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="1" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="0" spacing="5" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" enabled="1">
+              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4688,12 +4688,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -4701,44 +4701,44 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4747,11 +4747,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4761,38 +4761,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <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 exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="306" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4824,32 +4824,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4915,7 +4915,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4940,189 +4940,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" enabled="1">
+            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" enabled="1">
+            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" enabled="1">
+            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" enabled="1">
+            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5133,96 +5133,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="Name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="Name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="LineGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="LineGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="2" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -5230,54 +5230,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" enabled="1">
+              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5285,12 +5285,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5298,17 +5298,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -5317,34 +5317,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5376,12 +5376,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5389,7 +5389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5455,7 +5455,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5480,319 +5480,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" enabled="1">
+            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" enabled="1">
+            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" enabled="1">
+            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" symbol="0" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
-          <rule label="10KM" symbol="1" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
-          <rule label="5KM" symbol="2" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
+          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" enabled="1">
+            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}" enabled="1">
+                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="area" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" enabled="1">
+            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" enabled="1">
+                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@0@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" enabled="1">
+                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5800,147 +5800,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" enabled="1">
+            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}" enabled="1">
+            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" enabled="1">
+                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" enabled="1">
+                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5948,100 +5948,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" enabled="1">
+            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" enabled="1">
+                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{43e5e783-9402-4471-b264-9b43c9035744}" enabled="1">
+                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6049,147 +6049,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" enabled="1">
+            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" enabled="1">
+            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" enabled="1">
+                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" enabled="1">
+                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6197,100 +6197,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}" enabled="1">
+            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" enabled="1">
+                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" enabled="1">
+                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6298,57 +6298,57 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" enabled="1">
+            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -6356,54 +6356,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" enabled="1">
+              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6411,12 +6411,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6424,56 +6424,56 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6505,30 +6505,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6536,7 +6536,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6610,187 +6610,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" enabled="1">
+            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" enabled="1">
+            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" enabled="1">
+            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.796078">
+          <symbol alpha="0.796078" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" enabled="1">
+            <layer id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6801,268 +6801,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="227,0,185,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="4" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="4" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="227,0,185,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7071,145 +7071,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7217,54 +7217,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" enabled="1">
+              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7272,12 +7272,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="10" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7285,44 +7285,44 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -7330,30 +7330,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7429,7 +7429,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7495,7 +7495,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7524,173 +7524,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" enabled="1">
+            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" enabled="1">
+            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" enabled="1">
+            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" enabled="1">
+            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7701,13 +7701,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7715,54 +7715,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" enabled="1">
+              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7770,12 +7770,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7783,51 +7783,51 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7836,12 +7836,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
+        <alias name="" index="5" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -7852,42 +7852,42 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="cone_len"/>
+        <constraint exp="" desc="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="415" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
+          <column width="415" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7919,35 +7919,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 name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8013,7 +8013,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8027,26 +8027,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="cone_len" precision="0" type="6"/>
+        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis minScale="1e+08" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" labelsEnabled="1" readOnly="0" simplifyMaxScale="1" maxScale="0" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1">
+          <qgis simplifyDrawingTol="1" minScale="1e+08" simplifyAlgorithm="0" labelsEnabled="1" simplifyMaxScale="1" simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" styleCategories="AllStyleCategories">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="1">
+            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol name="0" force_rhr="0" clip_to_extent="1" type="line" alpha="1">
-                  <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+                <symbol alpha="1" name="0" force_rhr="0" type="line" clip_to_extent="1">
+                  <layer pass="0" locked="0" class="SimpleLine" enabled="1">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8065,9 +8065,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 value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8076,64 +8076,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontLetterSpacing="0" fontItalic="0" fieldName="comment" previewBkgrdColor="#ffffff" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontSize="11" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro" fontCapitals="0">
-                      <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                      <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1"/>
-                      <shadow shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowOffsetGlobal="1" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0"/>
+                    <text-style isExpression="0" namedStyle="Regular" fontUnderline="0" fontCapitals="0" fontItalic="0" blendMode="0" previewBkgrdColor="#ffffff" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.8" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="comment" useSubstitutions="0">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                      <background shapeJoinStyle="128" shapeSizeType="0" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255"/>
+                      <shadow shadowRadiusUnit="MM" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" leftDirectionSymbol="&lt;" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" plussign="0" formatNumbers="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-                    <placement distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" repeatDistance="0" offsetUnits="MM" dist="5" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" priority="5" geometryGeneratorType="PointGeometry" rotationAngle="0" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" preserveRotation="1" placement="4" geometryGeneratorEnabled="0" placementFlags="2" distUnits="MM" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0"/>
-                    <rendering displayAll="1" obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                    <text-format multilineAlign="4294967295" decimals="3" wrapChar="" formatNumbers="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0"/>
+                    <placement xOffset="0" priority="5" placementFlags="2" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" placement="4" geometryGenerator="" offsetUnits="MM" centroidInside="0" dist="5" quadOffset="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" preserveRotation="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" yOffset="0" repeatDistance="0"/>
+                    <rendering displayAll="1" maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontLetterSpacing="0" fontItalic="0" fieldName="round( $length, 1) || 'm'" previewBkgrdColor="#ffffff" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontSize="12" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro" fontCapitals="0">
-                      <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                      <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowOffsetGlobal="1" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0"/>
+                    <text-style isExpression="1" namedStyle="Semibold" fontUnderline="0" fontCapitals="0" fontItalic="0" blendMode="0" previewBkgrdColor="#ffffff" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" useSubstitutions="0">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                      <background shapeJoinStyle="64" shapeSizeType="0" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255"/>
+                      <shadow shadowRadiusUnit="MM" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" leftDirectionSymbol="&lt;" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" plussign="0" formatNumbers="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-                    <placement distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" repeatDistance="0" offsetUnits="MM" dist="1" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" priority="5" geometryGeneratorType="PointGeometry" rotationAngle="0" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" preserveRotation="1" placement="2" geometryGeneratorEnabled="0" placementFlags="15" distUnits="MM" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0"/>
-                    <rendering displayAll="0" obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                    <text-format multilineAlign="4294967295" decimals="3" wrapChar="" formatNumbers="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0"/>
+                    <placement xOffset="0" priority="5" placementFlags="15" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" placement="2" geometryGenerator="" offsetUnits="MM" centroidInside="0" dist="1" quadOffset="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" preserveRotation="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" yOffset="0" repeatDistance="0"/>
+                    <rendering displayAll="0" maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8150,17 +8150,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" minimumSize="0" labelPlacementMethod="XHeight">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penColor="#000000" enabled="0" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" backgroundColor="#ffffff" maxScaleDenominator="1e+08" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" rotationOffset="270" barWidth="5" scaleDependency="Area" height="15">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" priority="0" showAll="1">
+            <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8248,81 +8248,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" field="id" applyOnUpdate="0"/>
-              <default expression="" field="group" applyOnUpdate="0"/>
-              <default expression="" field="comment" applyOnUpdate="0"/>
-              <default expression="" field="moveable" applyOnUpdate="0"/>
-              <default expression="" field="type" applyOnUpdate="0"/>
-              <default expression="" field="name" applyOnUpdate="0"/>
-              <default expression="" field="hidden" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
-              <default expression="" field="fence_len" applyOnUpdate="0"/>
-              <default expression="" field="cone_len" applyOnUpdate="0"/>
+              <default 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"/>
             </defaults>
             <constraints>
-              <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <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=""/>
+              <constraint exp="" desc="" field="id"/>
+              <constraint exp="" desc="" field="group"/>
+              <constraint exp="" desc="" field="comment"/>
+              <constraint exp="" desc="" field="moveable"/>
+              <constraint exp="" desc="" field="type"/>
+              <constraint exp="" desc="" field="name"/>
+              <constraint exp="" desc="" field="hidden"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp="" desc="" field="fence_len"/>
+              <constraint exp="" desc="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" subType="0" name="fence_len" type="6" precision="0"/>
-              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" subType="0" name="fence_len" type="6" precision="0"/>
-              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" subType="0" name="cone_len" type="6" precision="0"/>
+              <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </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" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8353,32 +8353,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8395,458 +8395,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}" enabled="1">
+            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" enabled="1">
+            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" enabled="1">
+            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="1">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="1" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule label="Cones" symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Moveable fences" symbol="1" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Fixed fences" symbol="2" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Construction" symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule label="Is Visible" symbol="4" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" enabled="1">
+            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" enabled="1">
+            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" enabled="1">
+            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" enabled="1">
+            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" enabled="1">
+            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" enabled="1">
+            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8855,529 +8855,529 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="comment" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.80000000000000004" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="11" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.80000000000000004" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="comment" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="5" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1.8200000000000001" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="4294967295" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="5" dist="5" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -9386,13 +9386,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;id&quot;" type="QString"/>
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9400,54 +9400,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" enabled="1">
+              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9455,12 +9455,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9468,73 +9468,73 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9543,16 +9543,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -9567,62 +9567,62 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="moveable" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="comment"/>
+        <constraint exp="" desc="" field="moveable"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="hidden"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="fence_len"/>
+        <constraint exp="" desc="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="cone_len" precision="0" type="6"/>
+        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;name&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" name="comment" type="field"/>
-          <column hidden="0" width="-1" name="moveable" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="316" name="name" type="field"/>
-          <column hidden="0" width="-1" name="hidden" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="316" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9654,53 +9654,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="comment" reuseLastValue="0"/>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="hidden" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="moveable" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9774,189 +9774,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" enabled="1">
+            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" enabled="1">
+            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" enabled="1">
+            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" enabled="1">
+            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9967,11 +9967,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9979,54 +9979,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" enabled="1">
+              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10034,12 +10034,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10047,10 +10047,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10059,28 +10059,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10112,10 +10112,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10123,7 +10123,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10197,173 +10197,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" enabled="1">
+            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" enabled="1">
+            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" enabled="1">
+            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" enabled="1">
+            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10374,22 +10374,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10397,54 +10397,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" enabled="1">
+              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10452,18 +10452,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10471,40 +10471,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -10513,10 +10513,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -10525,34 +10525,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="page" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10584,14 +10584,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10599,7 +10599,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10665,7 +10665,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10676,7 +10676,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="1" memoryCache="0" targetFieldName="position" joinFieldName="position" dynamicForm="0" editable="1" cascadedDelete="0" customPrefix="csv_" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
+        <join dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" upsertOnEdit="1" joinLayerId="marshals_by_position20161003112326575" hasCustomPrefix="1" editable="1" joinFieldName="position" cascadedDelete="0">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10703,264 +10703,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="id" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="id" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" enabled="1">
+            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="114,155,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" enabled="1">
+            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" enabled="1">
+            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" symbol="0" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule label="Always show in marshal plan" symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule label="Show in marshal maps" symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol alpha="0.8" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" enabled="1">
+            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol alpha="0.8" name="1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" enabled="1">
+            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.01">
+          <symbol alpha="0.01" name="2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" enabled="1">
+            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10969,824 +10969,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <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)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.5" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.5" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="5" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.59999999999999998" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.59999999999999998" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="5" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="133,182,111,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="10" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="10" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -11795,157 +11795,157 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -11953,54 +11953,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{444d8fb8-2321-4272-9699-88b713425993}" enabled="1">
+              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12008,12 +12008,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12021,50 +12021,50 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
@@ -12073,11 +12073,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12087,38 +12087,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="notes" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default 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="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="notes"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="notes"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="notes" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12150,132 +12150,132 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_day"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_day" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_race" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_day" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_race" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="marshals_by_position_captain" labelOnTop="0"/>
-        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
-        <field name="marshals_by_position_club" labelOnTop="0"/>
-        <field name="marshals_by_position_day" labelOnTop="0"/>
-        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_instructions" labelOnTop="0"/>
-        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_position" labelOnTop="0"/>
-        <field name="marshals_by_position_race" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_day" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_race" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
-        <field name="marshals_by_position_club" reuseLastValue="0"/>
-        <field name="marshals_by_position_day" reuseLastValue="0"/>
-        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
-        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_position" reuseLastValue="0"/>
-        <field name="marshals_by_position_race" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12325,7 +12325,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="vector" geometry="No geometry" wkbType="NoGeometry" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" readOnly="0" type="vector" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12379,7 +12379,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start/>
@@ -12404,138 +12404,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" endField="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" durationField="" mode="0" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" symbology="Line" type="IndividualFeatures" clamping="Terrain" extrusion="0" zscale="1" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="line" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" enabled="1">
+            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="fill" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" enabled="1">
+            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="marker" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" enabled="1">
+            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12544,13 +12544,13 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="first_name" type="QString"/>
+            <Option type="QString" value="first_name"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12559,103 +12559,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_name">
+        <field name="first_name" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="race">
+        <field name="race" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12664,19 +12664,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias name="" index="0" field="day"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="first_name"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="club"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="race"/>
+        <alias name="" index="10" field="first_runner"/>
+        <alias name="" index="11" field="last_runner"/>
+        <alias name="" index="12" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="day" policy="Duplicate"/>
@@ -12694,70 +12694,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="first_name" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="club" applyOnUpdate="0"/>
-        <default expression="" field="phone" applyOnUpdate="0"/>
-        <default expression="" field="email" applyOnUpdate="0"/>
-        <default expression="" field="captain" applyOnUpdate="0"/>
-        <default expression="" field="captain_phone" applyOnUpdate="0"/>
-        <default expression="" field="race" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="race" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="race"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="first_name"/>
+        <constraint exp="" desc="" field="surname"/>
+        <constraint exp="" desc="" field="club"/>
+        <constraint exp="" desc="" field="phone"/>
+        <constraint exp="" desc="" field="email"/>
+        <constraint exp="" desc="" field="captain"/>
+        <constraint exp="" desc="" field="captain_phone"/>
+        <constraint exp="" desc="" field="race"/>
+        <constraint exp="" desc="" field="first_runner"/>
+        <constraint exp="" desc="" field="last_runner"/>
+        <constraint exp="" desc="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="first_name" type="field"/>
-          <column hidden="0" width="-1" name="race" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="first_name" hidden="0" type="field"/>
+          <column width="-1" name="race" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12789,76 +12789,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="surname"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_email" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="captain_phone" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="days" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="firstname" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="surname" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="captain" reuseLastValue="0"/>
-        <field name="captain_email" reuseLastValue="0"/>
-        <field name="captain_phone" reuseLastValue="0"/>
-        <field name="club" reuseLastValue="0"/>
-        <field name="days" reuseLastValue="0"/>
-        <field name="email" reuseLastValue="0"/>
-        <field name="first_runner" reuseLastValue="0"/>
-        <field name="firstname" reuseLastValue="0"/>
-        <field name="instructions" reuseLastValue="0"/>
-        <field name="last_runner" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="phone" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="surname" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -12924,7 +12924,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12949,326 +12949,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" enabled="1">
+            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="141,90,153,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" enabled="1">
+            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" enabled="1">
+            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{743d2826-031c-45d5-809e-09f032abdd16}" enabled="1">
+            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" enabled="1">
+            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" enabled="1">
+            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" enabled="1">
+                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" enabled="1">
+                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13281,11 +13281,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13293,54 +13293,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" enabled="1">
+              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13348,12 +13348,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13361,17 +13361,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13380,34 +13380,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13439,12 +13439,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13452,7 +13452,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13518,7 +13518,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13543,279 +13543,279 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" enabled="1">
+            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="232,113,141,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" enabled="1">
+            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" enabled="1">
+            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.75" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8.5" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.75" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferSize="1.5"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1.5"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
                   <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="1" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="2" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.20000000000000001" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="2" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="1" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13823,54 +13823,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" enabled="1">
+              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13878,12 +13878,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13891,110 +13891,110 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -14008,54 +14008,54 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="population" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="population"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="population"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="0" width="-1" name="population" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14087,26 +14087,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14114,7 +14114,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14180,7 +14180,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14205,327 +14205,327 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" enabled="1">
+            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,158,23,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" enabled="1">
+            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}" enabled="1">
+            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.80000000000000004" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="7" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="1" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="7" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.80000000000000004" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MapUnit" priority="3" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="4" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.29999999999999999" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="5" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="4" rotationUnit="AngleDegrees" repeatDistanceUnits="MapUnit" lineAnchorType="0" overlapHandling="PreventOverlap" priority="3" dist="0" placement="3" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="5" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -14533,54 +14533,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" enabled="1">
+              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14588,12 +14588,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14601,124 +14601,124 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -14727,22 +14727,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy field="osm_id" policy="Duplicate"/>
@@ -14763,82 +14763,82 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="highway" applyOnUpdate="0"/>
-        <default expression="" field="waterway" applyOnUpdate="0"/>
-        <default expression="" field="aerialway" applyOnUpdate="0"/>
-        <default expression="" field="barrier" applyOnUpdate="0"/>
-        <default expression="" field="man_made" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="other_tags" applyOnUpdate="0"/>
-        <default expression="" field="never_show" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
-        <default expression="" field="always_sho" applyOnUpdate="0"/>
-        <default expression="" field="resident_a" applyOnUpdate="0"/>
-        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="highway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="waterway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="aerialway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="barrier"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="man_made"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="other_tags"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="never_show"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="always_sho"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="highway"/>
+        <constraint exp="" desc="" field="waterway"/>
+        <constraint exp="" desc="" field="aerialway"/>
+        <constraint exp="" desc="" field="barrier"/>
+        <constraint exp="" desc="" field="man_made"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="other_tags"/>
+        <constraint exp="" desc="" field="never_show"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" desc="" field="always_sho"/>
+        <constraint exp="" desc="" field="resident_a"/>
+        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="160" name="name" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="highway" type="field"/>
-          <column hidden="0" width="-1" name="waterway" type="field"/>
-          <column hidden="0" width="-1" name="aerialway" type="field"/>
-          <column hidden="0" width="-1" name="barrier" type="field"/>
-          <column hidden="0" width="-1" name="man_made" type="field"/>
-          <column hidden="0" width="142" name="other_tags" type="field"/>
-          <column hidden="0" width="-1" name="never_show" type="field"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
-          <column hidden="0" width="-1" name="always_sho" type="field"/>
-          <column hidden="0" width="-1" name="resident_a" type="field"/>
-          <column hidden="0" width="-1" name="auxiliary_storage_labeling_show" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="142" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14870,94 +14870,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="aerialway" reuseLastValue="0"/>
-        <field name="always_sho" reuseLastValue="0"/>
-        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
-        <field name="barrier" reuseLastValue="0"/>
-        <field name="highway" reuseLastValue="0"/>
-        <field name="label_rota" reuseLastValue="0"/>
-        <field name="label_x" reuseLastValue="0"/>
-        <field name="label_y" reuseLastValue="0"/>
-        <field name="man_made" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="never_show" reuseLastValue="0"/>
-        <field name="osm_id" reuseLastValue="0"/>
-        <field name="other_tags" reuseLastValue="0"/>
-        <field name="resident_a" reuseLastValue="0"/>
-        <field name="waterway" reuseLastValue="0"/>
-        <field name="z_order" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="aerialway"/>
+        <field reuseLastValue="0" name="always_sho"/>
+        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
+        <field reuseLastValue="0" name="barrier"/>
+        <field reuseLastValue="0" name="highway"/>
+        <field reuseLastValue="0" name="label_rota"/>
+        <field reuseLastValue="0" name="label_x"/>
+        <field reuseLastValue="0" name="label_y"/>
+        <field reuseLastValue="0" name="man_made"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="never_show"/>
+        <field reuseLastValue="0" name="osm_id"/>
+        <field reuseLastValue="0" name="other_tags"/>
+        <field reuseLastValue="0" name="resident_a"/>
+        <field reuseLastValue="0" name="waterway"/>
+        <field reuseLastValue="0" name="z_order"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15007,7 +15007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15073,7 +15073,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15098,511 +15098,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" enabled="1">
+            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="231,113,72,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" enabled="1">
+            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" enabled="1">
+            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" enabled="1">
+            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" enabled="1">
+            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" enabled="1">
+            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" enabled="1">
+            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" enabled="1">
+            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" enabled="1">
+            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15611,128 +15611,128 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferSize="2"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="2" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="2"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRadiiY="2" shapeOffsetUnit="MM" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="3" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="3" preserveRotation="1" quadOffset="2" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="2"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="10" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="3" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" polygonPlacementFlags="2" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="2" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="3" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="10" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -15740,54 +15740,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" enabled="1">
+              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15795,12 +15795,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15808,31 +15808,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15841,10 +15841,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -15853,34 +15853,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15912,16 +15912,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -15929,7 +15929,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16003,246 +16003,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" enabled="1">
+            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}" enabled="1">
+            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" enabled="1">
+            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" pass="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}" enabled="1">
+            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" pass="0" locked="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" pass="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" enabled="1">
+                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" pass="0" locked="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                    <Option value="0" name="draw_inside_polygon" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" name="line_width" type="QString"/>
-                    <Option value="MM" name="line_width_unit" type="QString"/>
-                    <Option value="0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0" name="ring_filter" type="QString"/>
-                    <Option value="0" name="trim_distance_end" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                    <Option value="0" name="trim_distance_start" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                    <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                    <Option value="0" name="use_custom_dash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <Option name="customdash" type="QString" value="5;2"/>
+                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="customdash_unit" type="QString" value="MM"/>
+                    <Option name="dash_pattern_offset" type="QString" value="0"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                    <Option name="draw_inside_polygon" type="QString" value="0"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <Option name="line_width_unit" type="QString" value="MM"/>
+                    <Option name="offset" type="QString" value="0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="ring_filter" type="QString" value="0"/>
+                    <Option name="trim_distance_end" type="QString" value="0"/>
+                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                    <Option name="trim_distance_start" type="QString" value="0"/>
+                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                    <Option name="use_custom_dash" type="QString" value="0"/>
+                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" pass="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" enabled="1">
+            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16253,11 +16253,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -16265,54 +16265,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" enabled="1">
+              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16320,12 +16320,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -16333,10 +16333,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16345,29 +16345,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint exp="" desc="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="431" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16399,12 +16399,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16412,7 +16412,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16478,7 +16478,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16503,612 +16503,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" enabled="1">
+            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,207,80,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" enabled="1">
+            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" enabled="1">
+            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
-          <rule label="No Parking" symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule label="Lane Closed" symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule label="One-Way" symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
-          <rule label="Road Closures" symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" enabled="1">
+            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" enabled="1">
+            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" enabled="1">
+                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" enabled="1">
+            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" enabled="1">
+            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" enabled="1">
+                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{07696f80-e7db-403b-b380-82695a86ae34}" enabled="1">
+            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" enabled="1">
+            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e24fa060-35e4-4c51-b944-426558636610}" enabled="1">
+                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" enabled="1">
+            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17117,96 +17117,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="times" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="9" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="times" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="4294967295" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17214,54 +17214,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{27379576-e711-4788-850d-75df56ba927b}" enabled="1">
+              <layer id="{27379576-e711-4788-850d-75df56ba927b}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17269,12 +17269,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17282,31 +17282,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17315,10 +17315,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -17327,34 +17327,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="status"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="status"/>
+        <constraint exp="" desc="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="202" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="status" type="field"/>
-          <column hidden="0" width="-1" name="times" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17386,16 +17386,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17403,7 +17403,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37567806397844095</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -17477,1020 +17477,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{93207e61-042d-4541-8790-df2a776e7483}" enabled="1">
+            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" enabled="1">
+            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" enabled="1">
+            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" active="0" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="210,32,39,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="210,32,39,255">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" active="0" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="103,34,144,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="103,34,144,255">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" active="0" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="145,211,55,255">
+                    <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="190,178,151,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
+            <rule filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="145,211,55,255">
+                    <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -18500,13 +18500,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -18514,54 +18514,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" enabled="1">
+              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18569,12 +18569,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18582,144 +18582,144 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -18728,21 +18728,21 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
+        <alias name="" index="12" field="org_fid"/>
+        <alias name="" index="13" field="distance"/>
+        <alias name="" index="14" field="quadrant"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -18762,78 +18762,78 @@ def my_form_open(dialog, layer, feature):
         <policy field="quadrant" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="quadrant" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="quadrant"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="quadrant" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18865,62 +18865,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -18994,173 +18994,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" enabled="1">
+            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" enabled="1">
+            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" enabled="1">
+            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" enabled="1">
+            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19171,10 +19171,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -19182,28 +19182,28 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -19212,9 +19212,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -19222,30 +19222,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="area"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="area"/>
+        <constraint exp="" desc="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="area" type="field"/>
-          <column hidden="0" width="-1" name="rotation" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19268,7 +19268,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19334,7 +19334,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19359,195 +19359,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" enabled="1">
+            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" enabled="1">
+            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" enabled="1">
+            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0"/>
+          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" pass="0" id="{929956be-fb51-4c17-886b-1ed43d282cde}" enabled="1">
+            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" pass="0" locked="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19559,15 +19559,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="StringList">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -19575,54 +19575,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" enabled="1">
+              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19630,12 +19630,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -19643,103 +19643,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -19748,19 +19748,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19778,70 +19778,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="first_runn" applyOnUpdate="0"/>
-        <default expression="" field="last_runne" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runn"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runne"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="first_runn"/>
+        <constraint exp="" desc="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="179" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="first_runn" type="field"/>
-          <column hidden="0" width="-1" name="last_runne" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19873,58 +19873,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19932,7 +19932,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20006,326 +20006,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}" enabled="1">
+            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" enabled="1">
+            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" enabled="1">
+            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" enabled="1">
+            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" enabled="1">
+            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" enabled="1">
+            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" enabled="1">
+                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" enabled="1">
+                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -20338,11 +20338,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20350,54 +20350,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" enabled="1">
+              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20405,12 +20405,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20418,17 +20418,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20437,34 +20437,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20496,12 +20496,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20509,7 +20509,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -20583,236 +20583,236 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" enabled="1">
+            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" enabled="1">
+            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" enabled="1">
+            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="label" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="15" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="15" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="label" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="3" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20820,54 +20820,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" enabled="1">
+              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20875,12 +20875,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20888,17 +20888,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20907,34 +20907,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20966,12 +20966,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20979,7 +20979,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21045,7 +21045,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21070,267 +21070,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" enabled="1">
+            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" enabled="1">
+            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" enabled="1">
+            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="label" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="31,120,180,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="75" fontUnderline="0" namedStyle="Bold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Bold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="31,120,180,255" fieldName="label" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferSize="0.75"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0.5" shapeBorderWidthUnit="MM" shapeSizeX="0.75" shapeOffsetY="-0.14999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.75" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeSizeY="0.29999999999999999">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.75"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.75" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="31,120,206,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="-0.14999999999999999" shapeFillColor="255,255,255,204">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PolygonGeometry" dist="0" preserveRotation="1" quadOffset="1" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="1"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76000000000000001" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="6"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PolygonGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="1" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="6" zIndex="5" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -21339,17 +21339,17 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -21357,54 +21357,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" enabled="1">
+              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21412,12 +21412,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21425,53 +21425,53 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21480,11 +21480,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -21494,38 +21494,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="table_set" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="table_set"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="table_set"/>
+        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" desc="" field="races"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="table_set" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="130" name="races" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21557,25 +21557,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="label" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="table_set" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -21778,7 +21778,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230902 - Gun Run 2023 - Marshal Plan 1.3.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -21947,367 +21947,367 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Cones" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <visibility-preset name="Cones" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" 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="Fencing and Cones"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" 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 visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" 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="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" 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 visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22330,90 +22330,90 @@ def my_form_open(dialog, layer, feature):
     </contact>
     <links/>
     <dates>
-      <date value="2000-01-01T00:00:00" type="Created"/>
+      <date type="Created" value="2000-01-01T00:00:00"/>
     </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" enabled="1">
+          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" enabled="1">
+            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22421,15 +22421,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem sectionY="0" position="158.226,6.0007,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="132.391" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="158.226,6.0007,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="132.391,187.018,mm" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}">
+      <LayoutItem templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="158.226,6.0007,mm" sectionHeight="184.8" background="false" visibility="1" size="132.391,187.018,mm" frame="false" frameJoinStyle="miter" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65647" sectionY="0" id="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" position="158.226,6.0007,mm" hidePageIfEmpty="0" zValue="6" referencePoint="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -22437,15 +22437,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="20.4703,32.2333,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" outlineWidthM="0.1,mm" id="" titleAlignment="1" zValue="5" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="bevel" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="128.508,3.98741,mm" title="" boxSpace="2" positionOnPage="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}">
+      <LayoutItem symbolHeight="4" frame="true" position="128.508,3.98741,mm" boxSpace="2" columnCount="1" frameJoinStyle="bevel" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="5" wmsLegendWidth="50" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" itemRotation="0" size="20.4703,32.2333,mm" maxSymbolSize="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" positionLock="true" outlineWidthM="0.1,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="128.508,3.98741,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="128" blue="128" alpha="255" red="128"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -22456,242 +22456,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.8805579999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="11" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="4.8805579999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.1750019999999992" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="4.1750019999999992" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="3.8222239999999998" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="8" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="3.8222239999999998" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -22701,17 +22701,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -22719,166 +22719,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem position="98.7828,149.027,mm" id="Inset map" positionLock="true" blendMode="0" followPresetName="Marshal map - inset" excludeFromExports="0" drawCanvasItems="false" zValue="3" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.2,mm" positionOnPage="98.7828,149.027,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="56.5192,54.5647,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="98.7828,149.027,mm" background="true" visibility="1" size="56.5192,54.5647,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal map - inset" id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" zValue="3" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.2,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91073582826823696" xmax="18.39607548048533303" xmin="18.3917833749645645" ymax="-33.90659215121308279"/>
+        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" enabled="1">
+              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" enabled="1">
+              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -22886,34 +22886,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview position="3" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview show="1" blendMode="0" centered="1" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" enabled="1">
+            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22921,9 +22921,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -22931,173 +22931,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="3.53,6.0007,mm" id="Main map" positionLock="true" blendMode="0" followPresetName="Marshal map - main" excludeFromExports="0" drawCanvasItems="false" zValue="2" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="3.53,6.0007,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="142,187.018,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="3.53,6.0007,mm" background="false" visibility="1" size="142,187.018,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal map - main" id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90934028818313095" xmax="18.3944429313991229" xmin="18.39341592405077463" ymax="-33.90798769129818879"/>
+        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" enabled="1">
+              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" enabled="1">
+              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -23105,28 +23105,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="246.665,178.41,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="26.6623" zValue="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" anchorPoint="0" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="246.665,178.41,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2023_500.png" size="47.1065,27.6,mm" type="65640" pictureWidth="47.1065" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgFillColor="255,255,255,255" file="../GunRun2023_500.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="0" mapUuid="" positionOnPage="246.665,178.41,mm" pictureHeight="26.6623" background="false" visibility="1" size="47.1065,27.6,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" resizeMode="0" zValue="1" referencePoint="0" northMode="0" pictureWidth="47.1065" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23134,14 +23134,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" 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;" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" url="" resizeMode="0" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" 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" maxBreakDistance="10">
+        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23151,112 +23151,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="bool"/>
-          <Option value="0" name="imageCropMarginBottom" type="int"/>
-          <Option value="0" name="imageCropMarginLeft" type="int"/>
-          <Option value="0" name="imageCropMarginRight" type="int"/>
-          <Option value="0" name="imageCropMarginTop" type="int"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="bool"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="bool" value="true"/>
+          <Option name="imageCropMarginBottom" type="int" value="0"/>
+          <Option name="imageCropMarginLeft" type="int" value="0"/>
+          <Option name="imageCropMarginRight" type="int" value="0"/>
+          <Option name="imageCropMarginTop" type="int" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="bool" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="bool" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" filterFeatures="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" enabled="1"/>
+      <Atlas sortKey="&quot;id&quot;" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_positions" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" enabled="1">
+          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" enabled="1">
+            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23264,21 +23264,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem northOffset="0" position="286.027,2,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="7.97477" zValue="4" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" anchorPoint="0" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="286.027,2,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="arrows/NorthArrow_11.svg" size="9.45865,11,mm" type="65640" pictureWidth="6.31767" pictureRotation="330" mode="0">
+      <LayoutItem templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgFillColor="255,255,255,255" file="arrows/NorthArrow_11.svg" mode="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="286.027,2,mm" pictureHeight="7.97477" background="false" visibility="1" size="9.45865,11,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="330" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="6.31767" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23286,126 +23286,126 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="285.027,205.886,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="285.027,205.886,mm" frameJoinStyle="miter" background="false" itemRotation="270" size="142.543,10.3185,mm" valign="64" type="65641" labelText="[%upper( &quot;area&quot; )%]">
+      <LayoutItem templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="270" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="285.027,205.886,mm" valign="64" background="false" visibility="1" size="142.543,10.3185,mm" frame="false" frameJoinStyle="miter" labelText="[%upper( &quot;area&quot; )%]" type="65641" id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="1" size="145.54,16.2165,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="26.3519" lineCapStyle="square" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="3" lineJoinStyle="miter" style="Single Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="4" numMapUnitsPerScaleBarUnit="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" maxBarWidth="150" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="100" itemRotation="0" minBarWidth="50" height="3" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="7,189.669,mm" outlineWidth="0.3" positionOnPage="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="miter" numSubdivisions="1" frame="false" position="7,189.669,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="3" blendMode="0" id="" height="3" numSegments="4" zValue="2" maxBarWidth="150" excludeFromExports="0" boxContentSpace="1" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="50" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" itemRotation="0" segmentSizeMode="1" size="145.54,16.2165,mm" unitType="meters" style="Single Box" subdivisionsHeight="1.5" segmentMillimeters="26.3519" labelVerticalPlacement="0" numUnitsPerSegment="100" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="7,189.669,mm" outlineWidth="0.3" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -23413,349 +23413,349 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" enabled="1">
+            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" enabled="1">
+            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}" enabled="1">
+            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" enabled="1">
+            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}" enabled="1">
+            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="7,5.5,mm" id="" positionLock="true" blendMode="0" followPresetName="Start/Finish" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="7,5.5,mm" frameJoinStyle="miter" background="false" mapRotation="330" itemRotation="0" keepLayerSet="false" size="278.027,180.318,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="7,5.5,mm" background="false" visibility="1" size="278.027,180.318,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Start/Finish" id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="330" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" enabled="1">
+              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" enabled="1">
+              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23772,58 +23772,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -23831,117 +23831,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" sortKey="area" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" enabled="1"/>
+      <Atlas sortKey="area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="start_finish_area" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" enabled="1">
+          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" enabled="1">
+            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23949,15 +23949,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="38.1563,67.2879,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="11" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="0" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="256.808,5.21277,mm" title="" boxSpace="2" positionOnPage="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}">
+      <LayoutItem symbolHeight="4" frame="true" position="256.808,5.21277,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="11" wmsLegendWidth="50" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" itemRotation="0" size="38.1563,67.2879,mm" maxSymbolSize="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="0" positionOnPage="256.808,5.21277,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23968,242 +23968,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24213,33 +24213,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24247,77 +24247,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="148.46,6.45211,mm" valign="32" type="65641" labelText="FENCING: [% &quot;name&quot; %]">
+      <LayoutItem templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,191.188,mm" valign="32" background="false" visibility="1" size="148.46,6.45211,mm" frame="false" frameJoinStyle="miter" labelText="FENCING: [% &quot;name&quot; %]" type="65641" id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" zValue="10" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="182.723,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="56.3557" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.3557,6.45237,mm" sectionHeight="5.76" type="65647" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}">
+      <LayoutItem templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" sectionWidth="56.3557" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" background="false" visibility="1" size="56.3557,6.45237,mm" frame="false" frameJoinStyle="miter" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65647" sectionY="0" id="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" position="182.723,191.188,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24325,269 +24325,269 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="209.146,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="26.8205,6.82826,mm" valign="32" type="65641" labelText="REVISION 3.0">
+      <LayoutItem templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="209.146,198.083,mm" valign="32" background="false" visibility="1" size="26.8205,6.82826,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 3.0" type="65641" id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="62.6706,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.1638,7.07327,mm" valign="32" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="62.6706,198.083,mm" valign="32" background="false" visibility="1" size="51.1638,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" type="65641" id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="116.805,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="64.7594,7.10512,mm" valign="32" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="116.805,198.083,mm" valign="32" background="false" visibility="1" size="64.7594,7.10512,mm" frame="false" frameJoinStyle="miter" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" type="65641" id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="52.7903,7.07327,mm" valign="32" type="65641" labelText="Page [% @atlas_featurenumber %]">
+      <LayoutItem templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,198.083,mm" valign="32" background="false" visibility="1" size="52.7903,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Page [% @atlas_featurenumber %]" type="65641" id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.098,175.353,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="29.8354" zValue="4" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2022_250.png" size="49.3143,29.8354,mm" type="65640" pictureWidth="29.6535" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgFillColor="255,255,255,255" file="../GunRun2022_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.098,175.353,mm" pictureHeight="29.8354" background="false" visibility="1" size="49.3143,29.8354,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="29.6535" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24595,111 +24595,111 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="6.91779,197.79,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="232.01,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.91779,197.79,mm" background="false" visibility="1" size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" enabled="1">
+          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="0.2" size="109.51,15.8378,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="33.2496" lineCapStyle="square" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="1" lineJoinStyle="round" style="Double Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="2" numMapUnitsPerScaleBarUnit="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" maxBarWidth="100" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="20" itemRotation="0" minBarWidth="25" height="2" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="6.76779,2.8482,mm" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="round" numSubdivisions="1" frame="false" position="6.76779,2.8482,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="1" blendMode="0" id="" height="2" numSegments="2" zValue="2" maxBarWidth="100" excludeFromExports="0" boxContentSpace="0.2" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="25" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" itemRotation="0" segmentSizeMode="1" size="109.51,15.8378,mm" unitType="meters" style="Double Box" subdivisionsHeight="1.5" segmentMillimeters="33.2496" labelVerticalPlacement="0" numUnitsPerSegment="20" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="6.76779,2.8482,mm" outlineWidth="0.2" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -24707,268 +24707,268 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" enabled="1">
+            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" enabled="1">
+            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" enabled="1">
+            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" enabled="1">
+            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" enabled="1">
+            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="6.76779,9.35102,mm" id="" positionLock="true" blendMode="0" followPresetName="Fencing" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="283.418,180.92,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelMargin="0,mm" positionLock="true" opacity="0.9" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" visibility="1" size="283.418,180.92,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Fencing" id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90817940102677852" xmax="18.40522072458854552" xmin="18.40368928312333452" ymax="-33.90720180625849167"/>
+        <Extent xmax="18.40522072458854552" xmin="18.40368928312333452" ymin="-33.90817940102677852" ymax="-33.90720180625849167"/>
         <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>
@@ -24983,92 +24983,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" enabled="1">
+              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" enabled="1">
+              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25085,58 +25085,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25144,21 +25144,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" useSmartBreaks="true" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25168,250 +25168,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_and_cone_groups" sortKey="&quot;group&quot;" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" 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" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="fence_and_cone_groups" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="9" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="9" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}" enabled="1">
+          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" enabled="1">
+            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="4.43449,186.634,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.43449,186.634,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="83.9998,10.4638,mm" valign="64" type="65641" labelText="Directions to Start of Race">
+      <LayoutItem templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.43449,186.634,mm" valign="64" background="false" visibility="1" size="83.9998,10.4638,mm" frame="false" frameJoinStyle="miter" labelText="Directions to Start of Race" type="65641" id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="4.43449,197.498,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.43449,197.498,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="48.2923,9.511,mm" valign="32" type="65641" labelText="Gun Run">
+      <LayoutItem templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.43449,197.498,mm" valign="32" background="false" visibility="1" size="48.2923,9.511,mm" frame="false" frameJoinStyle="miter" labelText="Gun Run" type="65641" id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="59.0766,76,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="6" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="5" maxSymbolSize="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" wrapChar="" rasterBorderWidth="0" symbolWidth="9" columnSpace="0" columnCount="1" legendFilterByMap="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="round" equalColumnWidth="0" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="10.096,10.8563,mm" title="" boxSpace="2" positionOnPage="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}">
+      <LayoutItem symbolHeight="5" frame="true" position="10.096,10.8563,mm" boxSpace="2" columnCount="1" frameJoinStyle="round" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="6" wmsLegendWidth="50" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="0" opacity="1" wmsLegendHeight="25" equalColumnWidth="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" itemRotation="0" size="59.0766,76,mm" maxSymbolSize="0" legendFilterByMap="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" positionLock="false" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="10.096,10.8563,mm" referencePoint="0" minSymbolSize="0" symbolWidth="9">
         <FrameColor green="139" blue="139" alpha="255" red="139"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25422,242 +25422,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="7.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="7.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="6.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="6.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2.5" marginLeft="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="3" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="6.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -25667,32 +25667,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -25700,145 +25700,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="221.862,190.027,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="221.862,190.027,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="27.7839,6.871,mm" valign="32" type="65641" labelText="REVISION 1.0">
+      <LayoutItem templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="221.862,190.027,mm" valign="32" background="false" visibility="1" size="27.7839,6.871,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.0" type="65641" id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="197.975,197.498,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="197.975,197.498,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="197.975,197.498,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" zValue="4" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="249.646,179.724,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" positionLock="false" blendMode="0" excludeFromExports="0" pictureHeight="24.3824" zValue="3" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="249.646,179.724,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="42.9838,24.3824,mm" type="65640" pictureWidth="24.2337" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="249.646,179.724,mm" pictureHeight="24.3824" background="false" visibility="1" size="42.9838,24.3824,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="24.2337" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25846,85 +25846,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="4.58449,197.248,mm" shapeType="1" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.58449,197.248,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="244.912,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.58449,197.248,mm" background="false" visibility="1" size="244.912,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{25dc84af-8724-465b-a42c-c6c013132998}" enabled="1">
+          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="4.43449,6.411,mm" id="" positionLock="false" blendMode="0" followPresetName="Ask Me" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="4.43449,6.411,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="288.007,183.616,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" labelMargin="0,mm" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="4.43449,6.411,mm" background="true" visibility="1" size="288.007,183.616,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Ask Me" id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
         <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>
@@ -25939,149 +25939,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" enabled="1">
+              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" enabled="1">
+              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26089,318 +26089,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0" pageNameExpression="" sortFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0" sortFeatures="0" pageNameExpression="" filterFeatures="0" coverageLayer="" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" enabled="1">
+          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" enabled="1">
+            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="200.171,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="200.171,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.8714,mm" valign="32" type="65641" labelText="REVISION 1.4">
+      <LayoutItem templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="200.171,199.082,mm" valign="32" background="false" visibility="1" size="61.5373,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.4" type="65641" id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" zValue="13" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.7863,192.073,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.7863,192.073,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.60801,mm" valign="64" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]">
+      <LayoutItem templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.7863,192.073,mm" valign="64" background="false" visibility="1" size="61.5373,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Gun Run 2023: [%&quot;Source&quot;%]" type="65641" id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" zValue="12" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.7863,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.7863,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.60801,mm" valign="32" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM Dog|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]">
+      <LayoutItem templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.7863,199.082,mm" valign="32" background="false" visibility="1" size="61.5373,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM Dog|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" type="65641" id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" zValue="11" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="16.8993" zValue="10" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2023_250.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="29.7523" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgFillColor="255,255,255,255" file="../GunRun2023_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="262.196,188.218,mm" pictureHeight="16.8993" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" resizeMode="0" zValue="10" referencePoint="0" northMode="0" pictureWidth="29.7523" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26408,464 +26408,464 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.57644,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.57644,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.982,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.57644,198.832,mm" background="false" visibility="1" size="251.982,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" zValue="9" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" enabled="1">
+          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="8.21644,4.09761,mm" id="Trail Finish" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="8.21644,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="109.221,188.689,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="8.21644,4.09761,mm" background="true" visibility="1" size="109.221,188.689,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="8.21644,4.09761,mm" zValue="8" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93242806047424409" xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="113.002,2.39423,mm" id="Trail Start" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="113.002,2.39423,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="179.156,191.505,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="113.002,2.39423,mm" background="true" visibility="1" size="179.156,191.505,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="113.002,2.39423,mm" zValue="7" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95791657202656921" xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="5.86559,4.09761,mm" id="Left inset 21KM" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="false" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="67.7828,166.874,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" visibility="1" size="67.7828,166.874,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" zValue="6" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="133.191,119.125,mm" id="Bottom inset 21KM" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="133.191,119.125,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="113.3,76.1023,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="133.191,119.125,mm" background="true" visibility="1" size="113.3,76.1023,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" zValue="5" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="34" blue="144" alpha="255" red="103"/>
         <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="19.6693,7.89412,mm" id="End inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="19.6693,7.89412,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="68.3676,117.12,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="19.6693,7.89412,mm" background="true" visibility="0" size="68.3676,117.12,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" zValue="4" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" xmin="18.4044900556177744" ymax="-33.90099106513847005"/>
+        <Extent xmax="18.41240136424316276" xmin="18.4044900556177744" ymin="-33.91454383501641701" ymax="-33.90099106513847005"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="170.062,49.6297,mm" id="Start inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="170.062,49.6297,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="63.655,88.3012,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="170.062,49.6297,mm" background="true" visibility="0" size="63.655,88.3012,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" zValue="3" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" xmin="18.41445559427620893" ymax="-33.94253141264477591"/>
+        <Extent xmax="18.4185691326545431" xmin="18.41445559427620893" ymin="-33.94823764719958348" ymax="-33.94253141264477591"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="200.321,125.314,mm" id="Contour inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="200.321,125.314,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="75.8756,69.7635,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="200.321,125.314,mm" background="true" visibility="0" size="75.8756,69.7635,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" xmin="18.41234259163472942" ymax="-33.94692690566557047"/>
+        <Extent xmax="18.42332635419156972" xmin="18.41234259163472942" ymin="-33.95702588572736147" ymax="-33.94692690566557047"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="8.14144,4.02261,mm" id="Main Map" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="8.14144,4.02261,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.732,188.839,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="8.14144,4.02261,mm" background="true" visibility="1" size="282.732,188.839,mm" frame="true" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="8.14144,4.02261,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90999999999999659" xmax="18.41740108016482935" xmin="18.39900000000000091" ymax="-33.89770979439425957"/>
+        <Extent xmax="18.41685118589651893" xmin="18.37800000000000011" ymin="-33.92300000000000182" ymax="-33.89705103078635773"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" enabled="1">
+              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" enabled="1">
+              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26873,40 +26873,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview position="3" inverted="0" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview show="1" blendMode="0" centered="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" enabled="1">
+            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26914,9 +26914,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26924,115 +26924,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
+        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="all_routes" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}" enabled="1">
+          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="594,841,mm" type="65638">
+        <LayoutItem templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="594,841,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}" enabled="1">
+            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27040,15 +27040,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="4,4,mm" frame="false" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="8" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="25.5925,18.7971,mm" title="" boxSpace="2" positionOnPage="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}">
+      <LayoutItem symbolHeight="4" frame="false" position="25.5925,18.7971,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="8" wmsLegendWidth="50" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" itemRotation="0" size="4,4,mm" maxSymbolSize="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="25.5925,18.7971,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27059,242 +27059,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="6.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27304,17 +27304,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes20170907054841602" name="all_routes" legend_exp="">
+            <layer-tree-layer id="all_routes20170907054841602" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27322,207 +27322,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="5.2963,808.939,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.2963,808.939,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="91.9494,15.0649,mm" valign="64" type="65641" labelText="MARSHAL POSITIONS">
+      <LayoutItem templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.2963,808.939,mm" valign="64" background="false" visibility="1" size="91.9494,15.0649,mm" frame="false" frameJoinStyle="miter" labelText="MARSHAL POSITIONS" type="65641" id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="430.403,825.052,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="430.403,825.052,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.6212,15.3656,mm" valign="32" type="65641" labelText="REVISION 1.2">
+      <LayoutItem templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="430.403,825.052,mm" valign="32" background="false" visibility="1" size="56.6212,15.3656,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.2" type="65641" id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="372.175,808.942,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="372.175,808.942,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="114.848,15.0635,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="372.175,808.942,mm" valign="64" background="false" visibility="1" size="114.848,15.0635,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" zValue="4" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="489.557,775.395,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="63.9757" zValue="3" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="489.557,775.395,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="100.498,63.9757,mm" type="65640" pictureWidth="63.5856" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="489.557,775.395,mm" pictureHeight="63.9757" background="false" visibility="1" size="100.498,63.9757,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="63.5856" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27530,199 +27530,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="5.4463,824.155,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.4463,824.155,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="481.428,0.606138,mm" type="65643">
+      <LayoutItem templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.4463,824.155,mm" background="false" visibility="1" size="481.428,0.606138,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" enabled="1">
+          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="3.94474,5.25965,mm" id="" positionLock="true" blendMode="0" followPresetName="Marshal plan" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="3.94474,5.25965,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="584.759,811.213,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="3.94474,5.25965,mm" background="true" visibility="1" size="584.759,811.213,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal plan" id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" sortKey="page" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" enabled="1"/>
+      <Atlas sortKey="page" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="complete_marshal_overview" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" enabled="1">
+          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" enabled="1">
+            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="34.45,40.8,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="15" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="0" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="244.484,130.172,mm" title="" boxSpace="2" positionOnPage="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}">
+      <LayoutItem symbolHeight="4" frame="true" position="244.484,130.172,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="15" wmsLegendWidth="50" rasterBorder="1" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" itemRotation="0" size="34.45,40.8,mm" maxSymbolSize="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="244.484,130.172,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27730,242 +27730,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27975,15 +27975,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27991,207 +27991,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.37446,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="194.851,7.272,mm" valign="64" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS">
+      <LayoutItem templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.37446,191.81,mm" valign="64" background="false" visibility="1" size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" labelText="ACCESS ROUTES FOR RESIDENTS" type="65641" id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="204.225,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="57.4836,6.8714,mm" valign="64" type="65641" labelText="REVISION 1.1">
+      <LayoutItem templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="204.225,191.81,mm" valign="64" background="false" visibility="1" size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.1" type="65641" id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="210.038,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="210.038,199.082,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="17.4718" zValue="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="17.3653" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="262.196,188.218,mm" pictureHeight="17.4718" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="17.3653" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28199,100 +28199,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.59946,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.959,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.59946,198.832,mm" background="false" visibility="1" size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" enabled="1">
+          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="5.86559,4.09761,mm" id="" positionLock="true" blendMode="0" followPresetName="Access Routes" excludeFromExports="0" drawCanvasItems="false" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="67.7828,166.874,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" visibility="1" size="67.7828,166.874,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Access Routes" id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
         <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>
@@ -28307,149 +28307,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" enabled="1">
+              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" enabled="1">
+              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28457,45 +28457,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="9.44946,9.08557,mm" id="" positionLock="true" blendMode="0" followPresetName="Access Routes" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.012,175.592,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" visibility="1" size="282.012,175.592,mm" frame="true" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Access Routes" id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
         <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>
@@ -28510,149 +28510,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}" enabled="1">
+              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" enabled="1">
+              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28660,318 +28660,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" enabled="1">
+          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}" enabled="1">
+            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="9.37446,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="194.851,7.272,mm" valign="64" type="65641" labelText="Access to P9 Parking and VIP Tent">
+      <LayoutItem templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.37446,191.81,mm" valign="64" background="false" visibility="1" size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" labelText="Access to P9 Parking and VIP Tent" type="65641" id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="204.225,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="57.4836,6.8714,mm" valign="64" type="65641" labelText="REVISION 1.0">
+      <LayoutItem templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="204.225,191.81,mm" valign="64" background="false" visibility="1" size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.0" type="65641" id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="210.038,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="210.038,199.082,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="17.4718" zValue="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="17.3653" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="" positionOnPage="262.196,188.218,mm" pictureHeight="17.4718" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="17.3653" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28979,85 +28979,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.59946,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.959,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.59946,198.832,mm" background="false" visibility="1" size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{025604c1-b118-4f15-b140-54c9145260c4}" enabled="1">
+          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="9.44946,7.25098,mm" id="" positionLock="false" blendMode="0" followPresetName="" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="9.44946,7.25098,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.012,182.649,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="false">
+      <LayoutItem templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" labelMargin="0,mm" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="9.44946,7.25098,mm" background="true" visibility="1" size="282.012,182.649,mm" frame="false" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="false" followPresetName="" id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
         <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>
@@ -29072,149 +29072,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" enabled="1">
+              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" enabled="1">
+              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29222,108 +29222,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" enabled="1">
+          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,420,mm" type="65638">
+        <LayoutItem templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,420,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" enabled="1">
+            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29331,15 +29331,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem sectionY="0" position="112.086,406.476,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="23.5967" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="112.086,406.476,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="23.5967,8.3142,mm" sectionHeight="8.3142" type="65647" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}">
+      <LayoutItem templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" sectionWidth="23.5967" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="112.086,406.476,mm" sectionHeight="8.3142" background="false" visibility="1" size="23.5967,8.3142,mm" frame="false" frameJoinStyle="miter" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65647" sectionY="0" id="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" position="112.086,406.476,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29347,139 +29347,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="214.292,406.874,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="214.292,406.874,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="27.7839,7.51682,mm" valign="32" type="65641" labelText="REVISION 1.2">
+      <LayoutItem templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="214.292,406.874,mm" valign="32" background="false" visibility="1" size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.3" type="65641" id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="5.69321,398.344,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.69321,398.344,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="45.1194,8.13137,mm" valign="64" type="65641" labelText="MARSHAL POSITIONS">
+      <LayoutItem templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.69321,398.344,mm" valign="64" background="false" visibility="1" size="45.1194,8.13137,mm" frame="false" frameJoinStyle="miter" labelText="MARSHAL POSITIONS" type="65641" id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="22.2406,33.2917,mm" frame="false" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="6" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="15.6525,12.5708,mm" title="" boxSpace="2" positionOnPage="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}">
+      <LayoutItem symbolHeight="4" frame="false" position="15.6525,12.5708,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="6" wmsLegendWidth="50" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" itemRotation="0" size="22.2406,33.2917,mm" maxSymbolSize="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="15.6525,12.5708,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29490,242 +29490,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="6.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29735,19 +29735,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="group" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" type="QString" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29755,15 +29755,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="5.69321,406.988,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="118.192" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="5.69321,406.988,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="118.192,7.80192,mm" sectionHeight="7.80192" type="65647" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}">
+      <LayoutItem templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" sectionWidth="118.192" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.69321,406.988,mm" sectionHeight="7.80192" background="false" visibility="1" size="118.192,7.80192,mm" frame="false" frameJoinStyle="miter" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65647" sectionY="0" id="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" position="5.69321,406.988,mm" hidePageIfEmpty="0" zValue="5" referencePoint="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29771,15 +29771,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="148.501,398.344,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="4" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="93.5757" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="148.501,398.344,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="93.5757,8.13167,mm" sectionHeight="8.13167" type="65647" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}">
+      <LayoutItem templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" sectionWidth="93.5757" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="148.501,398.344,mm" sectionHeight="8.13167" background="false" visibility="1" size="93.5757,8.13167,mm" frame="false" frameJoinStyle="miter" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65647" sectionY="0" id="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" position="148.501,398.344,mm" hidePageIfEmpty="0" zValue="4" referencePoint="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29787,21 +29787,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.319,382.696,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="27.9119" zValue="3" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.319,382.696,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../../Gun Run 2023.png" size="49.3143,31.2967,mm" type="65640" pictureWidth="49.3143" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgFillColor="255,255,255,255" file="../../Gun Run 2023.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.319,382.696,mm" pictureHeight="27.9119" background="false" visibility="1" size="49.3143,31.2967,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="49.3143" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29809,101 +29809,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="5.84321,406.626,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.84321,406.626,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="236.083,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.84321,406.626,mm" background="false" visibility="1" size="236.083,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" enabled="1">
+          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="5.03,5.9483,mm" id="" positionLock="true" blendMode="0" followPresetName="Marshal plan" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.03,5.9483,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="286.94,392.396,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.03,5.9483,mm" background="true" visibility="1" size="286.94,392.396,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal plan" id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94797288016832226" xmax="18.38613924055453452" xmin="18.36924763341120581" ymax="-33.9248732774534929"/>
+        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="Page [% &quot;page&quot; %] " uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
-        <childFrame uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" useSmartBreaks="true" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" stylesheetEnabled="true" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29911,14 +29911,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '5KM Fun Run &amp; 21KM'&#xa;END&#xa;%]&lt;/strong>" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
-        <childFrame uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" useSmartBreaks="true" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '5KM Fun Run &amp; 21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29926,14 +29926,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" useSmartBreaks="true" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29943,99 +29943,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" sortKey="page" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" enabled="1"/>
+      <Atlas sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_overviews" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" enabled="1">
+          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" enabled="1">
+            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30043,15 +30043,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="38.1563,53.7608,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="11" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="0" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="256.808,5.21277,mm" title="" boxSpace="2" positionOnPage="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}">
+      <LayoutItem symbolHeight="4" frame="true" position="256.808,5.21277,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="11" wmsLegendWidth="50" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" itemRotation="0" size="38.1563,53.7608,mm" maxSymbolSize="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="0" positionOnPage="256.808,5.21277,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30062,242 +30062,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -30307,33 +30307,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30341,77 +30341,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="10" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="148.46,6.45211,mm" valign="32" type="65641" labelText="CONES: [% &quot;name&quot; %]">
+      <LayoutItem templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,191.188,mm" valign="32" background="false" visibility="1" size="148.46,6.45211,mm" frame="false" frameJoinStyle="miter" labelText="CONES: [% &quot;name&quot; %]" type="65641" id="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" position="6.76779,191.188,mm" zValue="10" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="182.723,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="56.3557" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.3557,6.45237,mm" sectionHeight="5.76" type="65647" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}">
+      <LayoutItem templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" sectionWidth="56.3557" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" background="false" visibility="1" size="56.3557,6.45237,mm" frame="false" frameJoinStyle="miter" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65647" sectionY="0" id="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" position="182.723,191.188,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30419,269 +30419,269 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="209.146,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="26.8205,6.82826,mm" valign="32" type="65641" labelText="REVISION 3.0">
+      <LayoutItem templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="209.146,198.083,mm" valign="32" background="false" visibility="1" size="26.8205,6.82826,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 3.0" type="65641" id="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" position="209.146,198.083,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="62.6706,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="0" frame="false" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.1638,7.07327,mm" valign="32" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="62.6706,198.083,mm" valign="32" background="false" visibility="0" size="51.1638,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" type="65641" id="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" position="62.6706,198.083,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="116.805,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="64.7594,7.10512,mm" valign="32" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="116.805,198.083,mm" valign="32" background="false" visibility="1" size="64.7594,7.10512,mm" frame="false" frameJoinStyle="miter" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" type="65641" id="" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" position="116.805,198.083,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="90.2083,7.07327,mm" valign="32" type="65641" labelText="Page [% @atlas_featurenumber %]">
+      <LayoutItem templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,198.083,mm" valign="32" background="false" visibility="1" size="90.2083,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Page [% @atlas_featurenumber %]" type="65641" id="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" position="6.76779,198.083,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.098,175.353,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="29.8354" zValue="4" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2022_250.png" size="49.3143,29.8354,mm" type="65640" pictureWidth="29.6535" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgFillColor="255,255,255,255" file="../GunRun2022_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.098,175.353,mm" pictureHeight="29.8354" background="false" visibility="1" size="49.3143,29.8354,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" position="243.098,175.353,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="29.6535" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30689,111 +30689,111 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="6.91779,197.79,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="232.01,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.91779,197.79,mm" background="false" visibility="1" size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" position="6.91779,197.79,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" enabled="1">
+          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="0.2" size="88.3204,15.8378,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="26.1864" lineCapStyle="square" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="1" lineJoinStyle="round" style="Double Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="2" numMapUnitsPerScaleBarUnit="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" maxBarWidth="100" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="30" itemRotation="0" minBarWidth="25" height="2" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="6.76779,2.8482,mm" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="round" numSubdivisions="1" frame="false" position="6.76779,2.8482,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="1" blendMode="0" id="" height="2" numSegments="2" zValue="2" maxBarWidth="100" excludeFromExports="0" boxContentSpace="0.2" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="25" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="1" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" itemRotation="0" segmentSizeMode="1" size="88.3204,15.8378,mm" unitType="meters" style="Double Box" subdivisionsHeight="1.5" segmentMillimeters="26.1864" labelVerticalPlacement="0" numUnitsPerSegment="30" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="6.76779,2.8482,mm" outlineWidth="0.2" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -30801,268 +30801,268 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ba8b697f-af10-49bc-b789-55678d099479}" enabled="1">
+            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" enabled="1">
+            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" enabled="1">
+            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" enabled="1">
+            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" enabled="1">
+            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="6.76779,9.35102,mm" id="" positionLock="true" blendMode="0" followPresetName="Cones" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="283.418,180.92,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" labelMargin="0,mm" positionLock="true" opacity="0.9" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" visibility="1" size="283.418,180.92,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Cones" id="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" position="6.76779,9.35102,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92052446432401069" xmax="18.3837273348683965" xmin="18.38081056635935795" ymax="-33.91866254684331494"/>
+        <Extent xmax="18.3837273348683965" xmin="18.38081056635935795" ymin="-33.92052446432401069" ymax="-33.91866254684331494"/>
         <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>
@@ -31077,92 +31077,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" enabled="1">
+              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" enabled="1">
+              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31179,58 +31179,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31238,21 +31238,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" useSmartBreaks="true" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31262,30 +31262,30 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_only_groups" sortKey="&quot;group&quot;" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" 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" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="cone_only_groups" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -31293,7 +31293,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.91820021920908346" xmax="18.43886703005560435" xmin="18.39963413089022737" ymax="-33.89691320746838699">
+    <DefaultViewExtent xmax="18.44846010669025915" xmin="18.3699943083595123" ymin="-33.93871522874037794" ymax="-33.896141205258985">
       <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>
@@ -31307,40 +31307,40 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
         <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
         <Option name="decimal_separator" type="invalid"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
         <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
@@ -31358,7 +31358,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="all_routes" destinationLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" destinationLayerProvider="ogr" autoAddTrackVertices="0">
+  <ProjectGpsSettings destinationLayer="" autoCommitFeatures="0" autoAddTrackVertices="0" destinationFollowsActiveLayer="1">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 6432f22..3576731 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 projectname="Gun Run" saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-02T11:40:06">
+<qgis projectname="Gun Run" version="3.32.2-Lima" saveUser="tim" saveUserFull="Timothy Allen" saveDateTime="2023-09-02T20:10:09">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,226 +17,226 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer hillshading-z-factor="1" edl-distance="0.5" light-altitude="45" combined-method="0" edl-is-active="1" edl-strength="1000" hillshading-is-active="0" hillshading-is-multidirectional="0" edl-distance-unit="0" is-active="0" light-azimuth="315"/>
+  <elevation-shading-renderer light-altitude="45" edl-strength="1000" light-azimuth="315" edl-is-active="1" is-active="0" hillshading-z-factor="1" combined-method="0" hillshading-is-active="0" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="1" name="Marshals">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [456]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="marshal_positions [456]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="extra_security20170921130834191" name="extra_security" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="extra_security20170921130834191" name="extra_security" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="marshals_by_position20161003112326575" name="marshals_by_position" legend_exp="" providerKey="delimitedtext">
+      <layer-tree-layer id="marshals_by_position20161003112326575" name="marshals_by_position" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="delimitedtext" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position [457]" name="cached_name" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="cached_name" type="QString" value="marshals_by_position [457]"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Fencing and Cones">
+    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" name="cached_name" type="QString"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" type="QString" value="fencing"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" 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" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" legend_exp="" providerKey="virtual">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="virtual" 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" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Markers">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)&amp;uid={cdc3d1cc-0fee-4cd6-8469-fbf7aeabfb6a}" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" legend_exp="" providerKey="memory">
+        <layer-tree-layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="memory" 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(5,0)&amp;uid={1822253a-3add-4fa0-95bb-001bacff6a53}" patch_size="-1,-1" checked="Qt::Checked">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="all_routes"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer 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" expanded="0" legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" legend_exp="" providerKey="ogr">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" 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" checked="Qt::Unchecked">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" name="cached_name" type="QString"/>
+          <Option name="cached_name" type="QString" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Feeding Stations">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="water_tables20170921142016467" name="water_tables" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="water_tables20170921142016467" name="water_tables" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="water_tables"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Ask Me">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="poi_labels" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="directions_to_start" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Residents Access">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="mayor" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="viplabels" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="viplabels"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="vipaccess"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="residents_access_roads"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="OSM data">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" expanded="0" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="osm_roads [3887]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" patch_size="0,0" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="osm_places [7]"/>
             <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="1" name="Start and Finish pages">
+    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -244,34 +244,34 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Unchecked" expanded="0" name="Elevation">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" legend_exp="" providerKey="ogr">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Map">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" providerKey="gdal">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" legend_exp="" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" checked="Qt::Unchecked">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="GDAL-City of Cape Town 2015 Aerial"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" expanded="1" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" legend_exp="" providerKey="wms">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="wms" 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" checked="Qt::Checked">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" name="cached_name" type="QString"/>
+            <Option name="cached_name" type="QString" value="Outlines"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
@@ -306,43 +306,43 @@
       <item>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" minScale="0" scaleDependencyMode="0" self-snapping="1" intersection-snapping="1" mode="3" maxScale="0" type="1" enabled="0">
+  <snapping-settings tolerance="10" minScale="0" unit="1" self-snapping="1" intersection-snapping="1" maxScale="0" type="1" mode="3" scaleDependencyMode="0" enabled="0">
     <individual-layer-settings>
-      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" units="1" enabled="1"/>
-      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" maxScale="0" type="2" units="2" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" units="1" enabled="0"/>
-      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" maxScale="0" type="2" units="2" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" units="1" enabled="0"/>
-      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" units="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" units="2" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" maxScale="0" type="0" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" maxScale="0" type="2" enabled="1"/>
+      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" maxScale="0" type="1" enabled="0"/>
+      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" units="2" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" maxScale="0" type="2" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" maxScale="0" type="0" enabled="0"/>
+      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" maxScale="0" type="1" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.41036315331831119</xmin>
-      <ymin>-33.91820021920908346</ymin>
-      <xmax>18.42813800762752052</xmax>
-      <ymax>-33.89691320746838699</ymax>
+      <xmin>18.3914523532156764</xmin>
+      <ymin>-33.93871522874037794</ymin>
+      <xmax>18.42700206183409506</xmax>
+      <ymax>-33.896141205258985</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -363,166 +363,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="marshal_positions">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <legendlayer name="marshal_overviews" drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="fencing">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="cone_only_groups">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="cone_only_groups" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="fence_and_cone_groups">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_and_cone_groups" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="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 showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="route_markers">
-          <filegroup open="true" hidden="false">
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+          <filegroup hidden="false" open="true">
             <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="all_routes">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <filegroup hidden="false" open="false">
         <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
+      <legendlayer name="water_tables" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="mayor">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer showFeatureCount="1" open="false" checked="Qt::Checked" drawingOrder="-1" name="osm_roads">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Checked" drawingOrder="-1" name="osm_places">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer showFeatureCount="1" open="true" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer showFeatureCount="0" open="false" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile isInOverview="0" visible="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer showFeatureCount="0" open="true" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" minScale="0" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyMessage="">
+  <main-annotation-layer legendPlaceholderImage="" minScale="0" refreshOnNotifyMessage="" maxScale="0" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -583,7 +583,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" type="raster" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -649,7 +649,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -660,9 +660,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -674,97 +674,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zscale="1" zoffset="0" band="1" enabled="0">
+      <elevation zoffset="0" band="1" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" enabled="1">
+            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" enabled="1">
+            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -773,28 +773,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer alphaBand="-1" redBand="1" opacity="0.5" blueBand="3" type="multibandcolor" greenBand="2" nodataColor="">
+        <rasterrenderer nodataColor="" greenBand="2" type="multibandcolor" opacity="0.5" alphaBand="-1" blueBand="3" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -805,14 +805,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" saturation="0" invertColors="0" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="0" type="raster" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -878,7 +878,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -889,7 +889,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -901,97 +901,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" zscale="1" zoffset="0" band="1" enabled="0">
+      <elevation zoffset="0" band="1" symbology="Line" enabled="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" enabled="1">
+            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" enabled="1">
+            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1000,28 +1000,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer alphaBand="-1" opacity="0.75" band="1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer nodataColor="" band="1" type="singlebandcolordata" opacity="0.75" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1032,14 +1032,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation grayscaleMode="0" colorizeRed="255" colorizeOn="0" saturation="0" invertColors="0" colorizeStrength="100" colorizeBlue="128" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1105,7 +1105,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="EPSG:4326" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="EPSG:4326" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1119,8 +1119,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="$length * 100" comment="" length="-1" typeName="double precision" subType="0" name="length_km" precision="0" type="6"/>
-        <field expression="$length * 100 * 1000" comment="" length="-1" typeName="double precision" subType="0" name="length_m" precision="0" type="6"/>
+        <field length="-1" comment="" expression="$length * 100" name="length_km" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1133,264 +1133,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="RouteLen" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="RouteLen" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" enabled="1">
+            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" enabled="1">
+            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" enabled="1">
+            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Show by day" symbol="0" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule label="21KM" symbol="1" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
-            <rule label="10KM" symbol="2" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
-            <rule label="5KM" symbol="3" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'"/>
-            <rule label="Trail" symbol="4" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" symbol="0" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="1" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="2" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" symbol="3" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="4" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule label="Always show" symbol="5" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0"/>
-          <rule label="Always show by day" symbol="6" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule symbol="5" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="6" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" enabled="1">
+            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" enabled="1">
+                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@0@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" enabled="1">
+                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1398,308 +1398,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" enabled="1">
+            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" enabled="1">
+            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" enabled="1">
+                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" enabled="1">
+            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" enabled="1">
+                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{d9268524-45f1-4731-945d-c43780c8de62}" enabled="1">
+            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" enabled="1">
+                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" enabled="1">
+                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1707,308 +1707,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" enabled="1">
+            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" enabled="1">
+            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" enabled="1">
+                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" enabled="1">
+            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" enabled="1">
+                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" enabled="1">
+            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" enabled="1">
+                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" enabled="1">
+                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2016,308 +2016,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" enabled="1">
+            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" enabled="1">
+            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" enabled="1">
+                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" enabled="1">
+            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" enabled="1">
+                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" enabled="1">
+            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" enabled="1">
+                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@3@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" enabled="1">
+                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2325,308 +2325,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" enabled="1">
+            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}" enabled="1">
+            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" enabled="1">
+                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" enabled="1">
+            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" enabled="1">
+                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" enabled="1">
+            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" enabled="1">
+                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@4@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" enabled="1">
+                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2634,641 +2634,641 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" enabled="1">
+            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" enabled="1">
+            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" enabled="1">
+                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" enabled="1">
+            <layer id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@4@3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@4@3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" enabled="1">
+                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" enabled="1">
+            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="6" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="6" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" enabled="1">
+            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{2e57e222-8d97-4174-bd9a-15edf5a876bf}">
-          <rule description="Active routes" key="{1c4db870-efe3-4deb-bf2d-8d67dc99bfef}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{e842cde3-5fe8-446f-9366-05d25752d7e6}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{740dbf42-b3b1-4282-b431-9154d8807416}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="round($length / 1000, 0)" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="km_marker()" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="km_marker()" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="1" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Route lengths" key="{e97a650a-759e-4efb-a251-968cf7ebd5fc}" active="0">
+          <rule description="Route lengths" active="0" key="{28afd8b9-3b2a-4198-bb1f-b81ba61c7434}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="round( $length * 100, 4 )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="km_marker()" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="50" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapAtNoCost" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="km_marker()" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="50" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapAtNoCost" priority="10" dist="2" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3277,21 +3277,21 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -3299,54 +3299,54 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{99bd229d-7319-436f-b616-1be11812c381}" enabled="1">
+              <layer id="{99bd229d-7319-436f-b616-1be11812c381}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3354,12 +3354,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3367,137 +3367,137 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3514,69 +3514,69 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
       </constraints>
       <constraintExpressions>
-        <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 exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="$length * 100" comment="" length="-1" typeName="double precision" subType="0" name="length_km" precision="0" type="6"/>
-        <field expression="$length * 100 * 1000" comment="" length="-1" typeName="double precision" subType="0" name="length_m" precision="0" type="6"/>
+        <field length="-1" comment="" expression="$length * 100" name="length_km" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Sort&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Sort&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="121" name="Name" type="field"/>
-          <column hidden="0" width="31" name="descriptio" type="field"/>
-          <column hidden="0" width="31" name="timestamp" type="field"/>
-          <column hidden="0" width="141" name="begin" type="field"/>
-          <column hidden="0" width="31" name="end" type="field"/>
-          <column hidden="0" width="66" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="39" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="188" name="length_m" type="field"/>
-          <column hidden="0" width="31" name="Sort" type="field"/>
-          <column hidden="0" width="31" name="day" type="field"/>
-          <column hidden="0" width="266" name="length_km" type="field"/>
+          <column width="121" name="Name" hidden="0" type="field"/>
+          <column width="31" name="descriptio" hidden="0" type="field"/>
+          <column width="31" name="timestamp" hidden="0" type="field"/>
+          <column width="141" name="begin" hidden="0" type="field"/>
+          <column width="31" name="end" hidden="0" type="field"/>
+          <column width="66" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="39" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="188" name="length_m" hidden="0" type="field"/>
+          <column width="31" name="Sort" hidden="0" type="field"/>
+          <column width="31" name="day" hidden="0" type="field"/>
+          <column width="266" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3608,53 +3608,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3728,189 +3728,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" enabled="1">
+            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" enabled="1">
+            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{53b6bbaf-4722-434f-a142-936b95477967}" enabled="1">
+            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" enabled="1">
+            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="183,72,75,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3921,9 +3921,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -3933,24 +3933,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -3959,9 +3959,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy field="ID" policy="Duplicate"/>
@@ -3969,25 +3969,25 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="height" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="elevation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="ID"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="height"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint exp="" desc="" field="ID"/>
+        <constraint exp="" desc="" field="height"/>
+        <constraint exp="" desc="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4010,18 +4010,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89686895033258196</ymax>
+        <ymax>-33.89694611440350513</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89686895033258196</ymax>
+        <ymax>-33.89694611440350513</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -4086,173 +4086,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" enabled="1">
+            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" enabled="1">
+            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" enabled="1">
+            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" enabled="1">
+            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4263,9 +4263,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -4273,35 +4273,35 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -4310,10 +4310,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -4322,28 +4322,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4366,7 +4366,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4442,173 +4442,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" enabled="1">
+            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" enabled="1">
+            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" enabled="1">
+            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" enabled="1">
+            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="38,162,105,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="f_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4619,13 +4619,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -4633,54 +4633,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="1" spacing="5" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="1" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="0" spacing="5" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" enabled="1">
+              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4688,12 +4688,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -4701,44 +4701,44 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4747,11 +4747,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4761,38 +4761,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <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 exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="306" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4824,32 +4824,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4915,7 +4915,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4940,189 +4940,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" enabled="1">
+            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" enabled="1">
+            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" enabled="1">
+            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" enabled="1">
+            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5133,96 +5133,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="Name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="Name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="LineGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="LineGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="2" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -5230,54 +5230,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" enabled="1">
+              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5285,12 +5285,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5298,17 +5298,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -5317,34 +5317,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5376,12 +5376,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5389,7 +5389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5455,7 +5455,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5480,319 +5480,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" enabled="1">
+            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" enabled="1">
+            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" enabled="1">
+            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" symbol="0" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
-          <rule label="10KM" symbol="1" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
-          <rule label="5KM" symbol="2" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
+          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" enabled="1">
+            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}" enabled="1">
+                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="area" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" enabled="1">
+            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" enabled="1">
+                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@0@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" enabled="1">
+                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5800,147 +5800,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" enabled="1">
+            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}" enabled="1">
+            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" enabled="1">
+                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" enabled="1">
+                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5948,100 +5948,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" enabled="1">
+            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" enabled="1">
+                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{43e5e783-9402-4471-b264-9b43c9035744}" enabled="1">
+                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6049,147 +6049,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" enabled="1">
+            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" enabled="1">
+            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" enabled="1">
+                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@0@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" enabled="1">
+                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6197,100 +6197,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}" enabled="1">
+            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" enabled="1">
+                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@2@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" enabled="1">
+                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6298,57 +6298,57 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" pass="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" enabled="1">
+            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -6356,54 +6356,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" enabled="1">
+              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6411,12 +6411,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6424,56 +6424,56 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6505,30 +6505,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6536,7 +6536,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6610,187 +6610,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" enabled="1">
+            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" enabled="1">
+            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" enabled="1">
+            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.796078">
+          <symbol alpha="0.796078" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" enabled="1">
+            <layer id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6801,268 +6801,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="1" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="227,0,185,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="4" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="4" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="227,0,185,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7071,145 +7071,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7217,54 +7217,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" enabled="1">
+              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7272,12 +7272,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="10" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7285,44 +7285,44 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -7330,30 +7330,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7429,7 +7429,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="Polygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7495,7 +7495,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7524,173 +7524,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" enabled="1">
+            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" enabled="1">
+            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" enabled="1">
+            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" enabled="1">
+            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7701,13 +7701,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -7715,54 +7715,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" enabled="1">
+              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7770,12 +7770,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7783,51 +7783,51 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7836,12 +7836,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
+        <alias name="" index="5" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -7852,42 +7852,42 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="cone_len"/>
+        <constraint exp="" desc="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="415" name="name" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
+          <column width="415" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7919,35 +7919,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 name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8013,7 +8013,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8027,26 +8027,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="cone_len" precision="0" type="6"/>
+        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis minScale="1e+08" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" labelsEnabled="1" readOnly="0" simplifyMaxScale="1" maxScale="0" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1">
+          <qgis simplifyDrawingTol="1" minScale="1e+08" simplifyAlgorithm="0" labelsEnabled="1" simplifyMaxScale="1" simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" styleCategories="AllStyleCategories">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="1">
+            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol name="0" force_rhr="0" clip_to_extent="1" type="line" alpha="1">
-                  <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+                <symbol alpha="1" name="0" force_rhr="0" type="line" clip_to_extent="1">
+                  <layer pass="0" locked="0" class="SimpleLine" enabled="1">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8065,9 +8065,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 value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8076,64 +8076,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontLetterSpacing="0" fontItalic="0" fieldName="comment" previewBkgrdColor="#ffffff" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" textOpacity="0.8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontSize="11" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro" fontCapitals="0">
-                      <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                      <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1"/>
-                      <shadow shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowOffsetGlobal="1" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0"/>
+                    <text-style isExpression="0" namedStyle="Regular" fontUnderline="0" fontCapitals="0" fontItalic="0" blendMode="0" previewBkgrdColor="#ffffff" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.8" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="comment" useSubstitutions="0">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                      <background shapeJoinStyle="128" shapeSizeType="0" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255"/>
+                      <shadow shadowRadiusUnit="MM" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" leftDirectionSymbol="&lt;" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" plussign="0" formatNumbers="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-                    <placement distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" repeatDistance="0" offsetUnits="MM" dist="5" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" priority="5" geometryGeneratorType="PointGeometry" rotationAngle="0" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" preserveRotation="1" placement="4" geometryGeneratorEnabled="0" placementFlags="2" distUnits="MM" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0"/>
-                    <rendering displayAll="1" obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                    <text-format multilineAlign="4294967295" decimals="3" wrapChar="" formatNumbers="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0"/>
+                    <placement xOffset="0" priority="5" placementFlags="2" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" placement="4" geometryGenerator="" offsetUnits="MM" centroidInside="0" dist="5" quadOffset="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" preserveRotation="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" yOffset="0" repeatDistance="0"/>
+                    <rendering displayAll="1" maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontLetterSpacing="0" fontItalic="0" fieldName="round( $length, 1) || 'm'" previewBkgrdColor="#ffffff" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" textOpacity="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontSize="12" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro" fontCapitals="0">
-                      <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                      <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowOffsetGlobal="1" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0"/>
+                    <text-style isExpression="1" namedStyle="Semibold" fontUnderline="0" fontCapitals="0" fontItalic="0" blendMode="0" previewBkgrdColor="#ffffff" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" useSubstitutions="0">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                      <background shapeJoinStyle="64" shapeSizeType="0" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255"/>
+                      <shadow shadowRadiusUnit="MM" shadowDraw="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowRadius="1.5" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowUnder="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowScale="100"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" leftDirectionSymbol="&lt;" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" plussign="0" formatNumbers="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-                    <placement distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" repeatDistance="0" offsetUnits="MM" dist="1" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" priority="5" geometryGeneratorType="PointGeometry" rotationAngle="0" quadOffset="4" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" preserveRotation="1" placement="2" geometryGeneratorEnabled="0" placementFlags="15" distUnits="MM" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" xOffset="0"/>
-                    <rendering displayAll="0" obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                    <text-format multilineAlign="4294967295" decimals="3" wrapChar="" formatNumbers="0" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0"/>
+                    <placement xOffset="0" priority="5" placementFlags="15" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" placement="2" geometryGenerator="" offsetUnits="MM" centroidInside="0" dist="1" quadOffset="4" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" preserveRotation="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" yOffset="0" repeatDistance="0"/>
+                    <rendering displayAll="0" maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" type="bool" value="true"/>
+                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                            <Option name="type" type="int" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8150,17 +8150,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory maxScaleDenominator="1e+08" minScaleDenominator="0" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" minimumSize="0" labelPlacementMethod="XHeight">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" field="" color="#000000"/>
+              <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penColor="#000000" enabled="0" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" backgroundColor="#ffffff" maxScaleDenominator="1e+08" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" penAlpha="255" rotationOffset="270" barWidth="5" scaleDependency="Area" height="15">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" priority="0" showAll="1">
+            <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8248,81 +8248,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" field="id" applyOnUpdate="0"/>
-              <default expression="" field="group" applyOnUpdate="0"/>
-              <default expression="" field="comment" applyOnUpdate="0"/>
-              <default expression="" field="moveable" applyOnUpdate="0"/>
-              <default expression="" field="type" applyOnUpdate="0"/>
-              <default expression="" field="name" applyOnUpdate="0"/>
-              <default expression="" field="hidden" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
-              <default expression="" field="fence_len" applyOnUpdate="0"/>
-              <default expression="" field="cone_len" applyOnUpdate="0"/>
+              <default 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"/>
             </defaults>
             <constraints>
-              <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <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=""/>
+              <constraint exp="" desc="" field="id"/>
+              <constraint exp="" desc="" field="group"/>
+              <constraint exp="" desc="" field="comment"/>
+              <constraint exp="" desc="" field="moveable"/>
+              <constraint exp="" desc="" field="type"/>
+              <constraint exp="" desc="" field="name"/>
+              <constraint exp="" desc="" field="hidden"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp="" desc="" field="fence_len"/>
+              <constraint exp="" desc="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" subType="0" name="fence_len" type="6" precision="0"/>
-              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" subType="0" name="fence_len" type="6" precision="0"/>
-              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" subType="0" name="cone_len" type="6" precision="0"/>
+              <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </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" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8353,32 +8353,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8395,458 +8395,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}" enabled="1">
+            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="133,182,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" enabled="1">
+            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" enabled="1">
+            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="95,130,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="1">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="1" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule label="Cones" symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Moveable fences" symbol="1" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Fixed fences" symbol="2" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule label="Construction" symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule label="Is Visible" symbol="4" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" checkstate="0"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" enabled="1">
+            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" enabled="1">
+            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" enabled="1">
+            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" enabled="1">
+            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" enabled="1">
+            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" enabled="1">
+            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8855,529 +8855,529 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="comment" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.80000000000000004" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="11" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.80000000000000004" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="comment" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="5" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="1.8200000000000001" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="4294967295" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="5" dist="5" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="11" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="6" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="14" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="14" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="6" dist="1" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="PositionX" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -9386,13 +9386,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="&quot;id&quot;" type="QString"/>
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9400,54 +9400,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" enabled="1">
+              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9455,12 +9455,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9468,73 +9468,73 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9543,16 +9543,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -9567,62 +9567,62 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="moveable" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="group" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="comment" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="moveable" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="hidden" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="fence_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="cone_len" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="group"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="comment"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="moveable"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="hidden"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="fence_len"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="group"/>
+        <constraint exp="" desc="" field="comment"/>
+        <constraint exp="" desc="" field="moveable"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="hidden"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="fence_len"/>
+        <constraint exp="" desc="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="fence_len" precision="0" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" length="-1" typeName="double precision" subType="0" name="cone_len" precision="0" type="6"/>
+        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" type="6" precision="0" typeName="double precision"/>
+        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" subType="0" type="6" precision="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;name&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="group" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" name="comment" type="field"/>
-          <column hidden="0" width="-1" name="moveable" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="316" name="name" type="field"/>
-          <column hidden="0" width="-1" name="hidden" type="field"/>
-          <column hidden="0" width="-1" name="fence_len" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="cone_len" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="316" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9654,53 +9654,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="comment" reuseLastValue="0"/>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="hidden" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="moveable" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9774,189 +9774,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" enabled="1">
+            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="164,113,88,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" enabled="1">
+            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" enabled="1">
+            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="117,81,63,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" enabled="1">
+            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9967,11 +9967,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9979,54 +9979,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" enabled="1">
+              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10034,12 +10034,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10047,10 +10047,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10059,28 +10059,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10112,10 +10112,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10123,7 +10123,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10197,173 +10197,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" enabled="1">
+            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" enabled="1">
+            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" enabled="1">
+            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="152,129,43,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" enabled="1">
+            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10374,22 +10374,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10397,54 +10397,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" enabled="1">
+              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10452,18 +10452,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10471,40 +10471,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -10513,10 +10513,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -10525,34 +10525,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="page" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="page"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="page" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10584,14 +10584,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10599,7 +10599,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10665,7 +10665,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10676,7 +10676,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="1" memoryCache="0" targetFieldName="position" joinFieldName="position" dynamicForm="0" editable="1" cascadedDelete="0" customPrefix="csv_" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
+        <join dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" upsertOnEdit="1" joinLayerId="marshals_by_position20161003112326575" hasCustomPrefix="1" editable="1" joinFieldName="position" cascadedDelete="0">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10703,264 +10703,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="id" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="id" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" enabled="1">
+            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="114,155,111,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" enabled="1">
+            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" enabled="1">
+            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="81,111,79,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" symbol="0" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule label="Always show in marshal plan" symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule label="Show in marshal maps" symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol alpha="0.8" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" enabled="1">
+            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol alpha="0.8" name="1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" enabled="1">
+            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="marker" clip_to_extent="1" alpha="0.01">
+          <symbol alpha="0.01" name="2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" enabled="1">
+            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" pass="1" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10969,824 +10969,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <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)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="1" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="2" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="1" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="2" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.5" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.5" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                       <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="5" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.59999999999999998" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="6" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="6" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.59999999999999998" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="8" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="8" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="5" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="position" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="position" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="3" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0.20000000000000001" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRadiiUnit="MM" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeSizeY="0.20000000000000001">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="133,182,111,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,255" name="color" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-              <rendering obstacle="0" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="10" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="10" scaleMax="10000000" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -11795,157 +11795,157 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -11953,54 +11953,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{444d8fb8-2321-4272-9699-88b713425993}" enabled="1">
+              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12008,12 +12008,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12021,50 +12021,50 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
@@ -12073,11 +12073,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12087,38 +12087,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="notes" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default 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="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="notes" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="notes"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="notes"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="notes" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12150,132 +12150,132 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_day"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_day" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_race" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_day" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_race" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="marshals_by_position_captain" labelOnTop="0"/>
-        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
-        <field name="marshals_by_position_club" labelOnTop="0"/>
-        <field name="marshals_by_position_day" labelOnTop="0"/>
-        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_instructions" labelOnTop="0"/>
-        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_position" labelOnTop="0"/>
-        <field name="marshals_by_position_race" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_day" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_race" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
-        <field name="marshals_by_position_club" reuseLastValue="0"/>
-        <field name="marshals_by_position_day" reuseLastValue="0"/>
-        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
-        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_position" reuseLastValue="0"/>
-        <field name="marshals_by_position_race" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12325,7 +12325,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" autoRefreshEnabled="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="vector" geometry="No geometry" wkbType="NoGeometry" refreshOnNotifyMessage="">
+    <maplayer legendPlaceholderImage="" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" readOnly="0" type="vector" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12379,7 +12379,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start/>
@@ -12404,138 +12404,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" endField="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" durationField="" mode="0" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" symbology="Line" type="IndividualFeatures" clamping="Terrain" extrusion="0" zscale="1" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="line" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" enabled="1">
+            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="fill" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" enabled="1">
+            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" clip_to_extent="1" type="marker" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" enabled="1">
+            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12544,13 +12544,13 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="first_name" type="QString"/>
+            <Option type="QString" value="first_name"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12559,103 +12559,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_name">
+        <field name="first_name" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="race">
+        <field name="race" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12664,19 +12664,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias name="" index="0" field="day"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="first_name"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="club"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="race"/>
+        <alias name="" index="10" field="first_runner"/>
+        <alias name="" index="11" field="last_runner"/>
+        <alias name="" index="12" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="day" policy="Duplicate"/>
@@ -12694,70 +12694,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="first_name" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="club" applyOnUpdate="0"/>
-        <default expression="" field="phone" applyOnUpdate="0"/>
-        <default expression="" field="email" applyOnUpdate="0"/>
-        <default expression="" field="captain" applyOnUpdate="0"/>
-        <default expression="" field="captain_phone" applyOnUpdate="0"/>
-        <default expression="" field="race" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="position" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="surname" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="club" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="email" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="captain_phone" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="race" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runner" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="instructions" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="position"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="surname"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="club"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="email"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="race"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="first_name"/>
+        <constraint exp="" desc="" field="surname"/>
+        <constraint exp="" desc="" field="club"/>
+        <constraint exp="" desc="" field="phone"/>
+        <constraint exp="" desc="" field="email"/>
+        <constraint exp="" desc="" field="captain"/>
+        <constraint exp="" desc="" field="captain_phone"/>
+        <constraint exp="" desc="" field="race"/>
+        <constraint exp="" desc="" field="first_runner"/>
+        <constraint exp="" desc="" field="last_runner"/>
+        <constraint exp="" desc="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="first_name" type="field"/>
-          <column hidden="0" width="-1" name="race" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="first_name" hidden="0" type="field"/>
+          <column width="-1" name="race" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12789,76 +12789,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="surname"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_email" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="captain_phone" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="days" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="firstname" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="surname" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="captain" reuseLastValue="0"/>
-        <field name="captain_email" reuseLastValue="0"/>
-        <field name="captain_phone" reuseLastValue="0"/>
-        <field name="club" reuseLastValue="0"/>
-        <field name="days" reuseLastValue="0"/>
-        <field name="email" reuseLastValue="0"/>
-        <field name="first_runner" reuseLastValue="0"/>
-        <field name="firstname" reuseLastValue="0"/>
-        <field name="instructions" reuseLastValue="0"/>
-        <field name="last_runner" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="phone" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="surname" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -12924,7 +12924,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12949,326 +12949,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" enabled="1">
+            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="141,90,153,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" enabled="1">
+            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" enabled="1">
+            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="101,64,109,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{743d2826-031c-45d5-809e-09f032abdd16}" enabled="1">
+            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" enabled="1">
+            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" enabled="1">
+            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" enabled="1">
+                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" enabled="1">
+                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13281,11 +13281,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13293,54 +13293,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" enabled="1">
+              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13348,12 +13348,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13361,17 +13361,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13380,34 +13380,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13439,12 +13439,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13452,7 +13452,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13518,7 +13518,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13543,279 +13543,279 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" enabled="1">
+            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="232,113,141,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" enabled="1">
+            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" enabled="1">
+            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="166,81,101,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.75" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8.5" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.75" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferSize="1.5"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1.5"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
                   <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="1" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="2" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.20000000000000001" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="2" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="1" dist="0" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -13823,54 +13823,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" enabled="1">
+              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13878,12 +13878,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13891,110 +13891,110 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -14008,54 +14008,54 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="population" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="population" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="population"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="population"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="0" width="-1" name="population" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14087,26 +14087,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14114,7 +14114,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14180,7 +14180,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14205,327 +14205,327 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" enabled="1">
+            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,158,23,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" enabled="1">
+            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}" enabled="1">
+            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="182,113,16,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.80000000000000004" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="7" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="1" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="7" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="0.80000000000000004" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="0" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MapUnit" priority="3" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="4" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="LineGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="1" obstacleFactor="0.29999999999999999" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="5" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="0" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="LineGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="4" rotationUnit="AngleDegrees" repeatDistanceUnits="MapUnit" lineAnchorType="0" overlapHandling="PreventOverlap" priority="3" dist="0" placement="3" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="5" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 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>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -14533,54 +14533,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" enabled="1">
+              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14588,12 +14588,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14601,124 +14601,124 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -14727,22 +14727,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy field="osm_id" policy="Duplicate"/>
@@ -14763,82 +14763,82 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="highway" applyOnUpdate="0"/>
-        <default expression="" field="waterway" applyOnUpdate="0"/>
-        <default expression="" field="aerialway" applyOnUpdate="0"/>
-        <default expression="" field="barrier" applyOnUpdate="0"/>
-        <default expression="" field="man_made" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="other_tags" applyOnUpdate="0"/>
-        <default expression="" field="never_show" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
-        <default expression="" field="always_sho" applyOnUpdate="0"/>
-        <default expression="" field="resident_a" applyOnUpdate="0"/>
-        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="highway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="waterway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="aerialway" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="barrier" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="man_made" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="z_order" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="other_tags" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="never_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_x" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_y" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label_rota" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="always_sho" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="resident_a" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="osm_id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="highway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="waterway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="aerialway"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="barrier"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="man_made"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="z_order"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="other_tags"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="never_show"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_x"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_y"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label_rota"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="always_sho"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="resident_a"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="highway"/>
+        <constraint exp="" desc="" field="waterway"/>
+        <constraint exp="" desc="" field="aerialway"/>
+        <constraint exp="" desc="" field="barrier"/>
+        <constraint exp="" desc="" field="man_made"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="other_tags"/>
+        <constraint exp="" desc="" field="never_show"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" desc="" field="always_sho"/>
+        <constraint exp="" desc="" field="resident_a"/>
+        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="-1" name="osm_id" type="field"/>
-          <column hidden="0" width="160" name="name" type="field"/>
-          <column hidden="0" width="-1" name="z_order" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="highway" type="field"/>
-          <column hidden="0" width="-1" name="waterway" type="field"/>
-          <column hidden="0" width="-1" name="aerialway" type="field"/>
-          <column hidden="0" width="-1" name="barrier" type="field"/>
-          <column hidden="0" width="-1" name="man_made" type="field"/>
-          <column hidden="0" width="142" name="other_tags" type="field"/>
-          <column hidden="0" width="-1" name="never_show" type="field"/>
-          <column hidden="0" width="-1" name="label_x" type="field"/>
-          <column hidden="0" width="-1" name="label_y" type="field"/>
-          <column hidden="0" width="-1" name="label_rota" type="field"/>
-          <column hidden="0" width="-1" name="always_sho" type="field"/>
-          <column hidden="0" width="-1" name="resident_a" type="field"/>
-          <column hidden="0" width="-1" name="auxiliary_storage_labeling_show" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="142" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14870,94 +14870,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="aerialway" reuseLastValue="0"/>
-        <field name="always_sho" reuseLastValue="0"/>
-        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
-        <field name="barrier" reuseLastValue="0"/>
-        <field name="highway" reuseLastValue="0"/>
-        <field name="label_rota" reuseLastValue="0"/>
-        <field name="label_x" reuseLastValue="0"/>
-        <field name="label_y" reuseLastValue="0"/>
-        <field name="man_made" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="never_show" reuseLastValue="0"/>
-        <field name="osm_id" reuseLastValue="0"/>
-        <field name="other_tags" reuseLastValue="0"/>
-        <field name="resident_a" reuseLastValue="0"/>
-        <field name="waterway" reuseLastValue="0"/>
-        <field name="z_order" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="aerialway"/>
+        <field reuseLastValue="0" name="always_sho"/>
+        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
+        <field reuseLastValue="0" name="barrier"/>
+        <field reuseLastValue="0" name="highway"/>
+        <field reuseLastValue="0" name="label_rota"/>
+        <field reuseLastValue="0" name="label_x"/>
+        <field reuseLastValue="0" name="label_y"/>
+        <field reuseLastValue="0" name="man_made"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="never_show"/>
+        <field reuseLastValue="0" name="osm_id"/>
+        <field reuseLastValue="0" name="other_tags"/>
+        <field reuseLastValue="0" name="resident_a"/>
+        <field reuseLastValue="0" name="waterway"/>
+        <field reuseLastValue="0" name="z_order"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15007,7 +15007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15073,7 +15073,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15098,511 +15098,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" enabled="1">
+            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="231,113,72,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" enabled="1">
+            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" enabled="1">
+            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="165,81,51,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" enabled="1">
+            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" enabled="1">
+            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" enabled="1">
+            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" enabled="1">
+            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" enabled="1">
+            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="5" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="5" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" pass="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" enabled="1">
+            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" pass="0" locked="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15611,128 +15611,128 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="name" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="name" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferSize="2"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="2" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="1">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="2"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRadiiY="2" shapeOffsetUnit="MM" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                   <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="3" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="3" preserveRotation="1" quadOffset="2" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="2"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1.8" fontLimitPixelSize="0" zIndex="10" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="3" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" polygonPlacementFlags="2" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="2" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="3" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="10" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -15740,54 +15740,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" enabled="1">
+              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15795,12 +15795,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15808,31 +15808,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15841,10 +15841,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -15853,34 +15853,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="name" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15912,16 +15912,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -15929,7 +15929,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16003,246 +16003,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" enabled="1">
+            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="152,125,183,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}" enabled="1">
+            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" enabled="1">
+            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="109,89,131,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" pass="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}" enabled="1">
+            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" pass="0" locked="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@0@0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@0@0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" pass="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" enabled="1">
+                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" pass="0" locked="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                    <Option value="0" name="draw_inside_polygon" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" name="line_width" type="QString"/>
-                    <Option value="MM" name="line_width_unit" type="QString"/>
-                    <Option value="0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0" name="ring_filter" type="QString"/>
-                    <Option value="0" name="trim_distance_end" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                    <Option value="0" name="trim_distance_start" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                    <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                    <Option value="0" name="use_custom_dash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <Option name="customdash" type="QString" value="5;2"/>
+                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="customdash_unit" type="QString" value="MM"/>
+                    <Option name="dash_pattern_offset" type="QString" value="0"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                    <Option name="draw_inside_polygon" type="QString" value="0"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <Option name="line_width_unit" type="QString" value="MM"/>
+                    <Option name="offset" type="QString" value="0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="ring_filter" type="QString" value="0"/>
+                    <Option name="trim_distance_end" type="QString" value="0"/>
+                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                    <Option name="trim_distance_start" type="QString" value="0"/>
+                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                    <Option name="use_custom_dash" type="QString" value="0"/>
+                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" pass="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" enabled="1">
+            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16253,11 +16253,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -16265,54 +16265,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" enabled="1">
+              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16320,12 +16320,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="1" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="1" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -16333,10 +16333,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16345,29 +16345,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint exp="" desc="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="431" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16399,12 +16399,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16412,7 +16412,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16478,7 +16478,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16503,612 +16503,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" enabled="1">
+            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,207,80,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" enabled="1">
+            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" enabled="1">
+            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,148,57,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
-          <rule label="No Parking" symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule label="Lane Closed" symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule label="One-Way" symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
-          <rule label="Road Closures" symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" enabled="1">
+            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" pass="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" enabled="1">
+            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" enabled="1">
+                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="1" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="2" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="2" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" enabled="1">
+            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" enabled="1">
+            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@2@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@2@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" enabled="1">
+                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="3" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="3" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{07696f80-e7db-403b-b380-82695a86ae34}" enabled="1">
+            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" enabled="1">
+            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@3@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@3@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" pass="0" id="{e24fa060-35e4-4c51-b944-426558636610}" enabled="1">
+                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="3.5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="4" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="4" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" enabled="1">
+            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17117,96 +17117,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="times" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="9" useSubstitutions="0" fontWeight="50" fontUnderline="0" namedStyle="Regular" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Regular" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="times" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="4294967295" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -17214,54 +17214,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{27379576-e711-4788-850d-75df56ba927b}" enabled="1">
+              <layer id="{27379576-e711-4788-850d-75df56ba927b}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17269,12 +17269,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17282,31 +17282,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17315,10 +17315,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -17327,34 +17327,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="status" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="times" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="status"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="status"/>
+        <constraint exp="" desc="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="202" name="type" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="status" type="field"/>
-          <column hidden="0" width="-1" name="times" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17386,16 +17386,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17403,7 +17403,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="100000" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="100000" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37567806397844095</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -17477,1020 +17477,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{93207e61-042d-4541-8790-df2a776e7483}" enabled="1">
+            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="225,89,137,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" enabled="1">
+            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" enabled="1">
+            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="161,64,98,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeSizeY="0">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="0,0,0,255">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties" type="Map">
                             <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                             <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+              <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                     <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                     <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" active="0" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="210,32,39,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="210,32,39,255">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="3" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="3" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" active="0" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="103,34,144,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="103,34,144,255">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties" type="Map">
                         <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                         <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                         <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" active="0" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="145,211,55,255">
+                    <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="190,178,151,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
+            <rule filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="255,255,255,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="1" fontSize="10" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+                <text-style legendString="Aa" isExpression="1" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="255,255,255,255" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferSize="1"/>
-                  <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                  <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="1" shapeBorderWidthUnit="MM" shapeSizeX="1" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="1" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeSizeY="0">
-                    <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+                  <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                  <background shapeSizeType="0" shapeSizeX="1" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="145,211,55,255">
+                    <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" name="name" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" name="outline_width" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="diameter" name="scale_method" type="QString"/>
-                          <Option value="2" name="size" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="size_unit" type="QString"/>
-                          <Option value="1" name="vertical_anchor_point" type="QString"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                      <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" name="joinstyle" type="QString"/>
-                          <Option value="0,0" name="offset" type="QString"/>
-                          <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                          <Option value="MM" name="offset_unit" type="QString"/>
-                          <Option value="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-                <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="10" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="20" distUnits="MM" lineAnchorClipping="0" allowDegraded="1" overlapHandling="AllowOverlapIfRequired" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PointGeometry" dist="2" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-20" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" offsetType="0" xOffset="0"/>
-                <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="2" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+                <text-format multilineAlign="3" decimals="0" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-20" centroidWhole="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="AllowOverlapIfRequired" priority="10" dist="2" placement="6" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering maxNumLabels="2000" zIndex="0" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties" type="Map">
                       <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
                       <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                       <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
                     <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -18500,13 +18500,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -18514,54 +18514,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" enabled="1">
+              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18569,12 +18569,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18582,144 +18582,144 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -18728,21 +18728,21 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="Distance"/>
+        <alias name="" index="6" field="RouteLen"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="Sort"/>
+        <alias name="" index="9" field="day"/>
+        <alias name="" index="10" field="length_km"/>
+        <alias name="" index="11" field="length_m"/>
+        <alias name="" index="12" field="org_fid"/>
+        <alias name="" index="13" field="distance"/>
+        <alias name="" index="14" field="quadrant"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -18762,78 +18762,78 @@ def my_form_open(dialog, layer, feature):
         <policy field="quadrant" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Sort" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="quadrant" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Sort"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="quadrant"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="Distance" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="Sort" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="quadrant" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18865,62 +18865,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -18994,173 +18994,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" enabled="1">
+            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="229,182,54,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" enabled="1">
+            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" enabled="1">
+            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="164,130,39,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" enabled="1">
+            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19171,10 +19171,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -19182,28 +19182,28 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -19212,9 +19212,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -19222,30 +19222,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="area" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="rotation" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="area"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="area"/>
+        <constraint exp="" desc="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="area" type="field"/>
-          <column hidden="0" width="-1" name="rotation" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19268,7 +19268,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19334,7 +19334,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19359,195 +19359,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" enabled="1">
+            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="196,60,57,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" enabled="1">
+            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" enabled="1">
+            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="140,43,41,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0"/>
+          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" pass="0" id="{929956be-fb51-4c17-886b-1ed43d282cde}" enabled="1">
+            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" pass="0" locked="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties" type="Map">
                     <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                     <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19559,15 +19559,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="StringList">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -19575,54 +19575,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" enabled="1">
+              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19630,12 +19630,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -19643,103 +19643,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -19748,19 +19748,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19778,70 +19778,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="first_runn" applyOnUpdate="0"/>
-        <default expression="" field="last_runne" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="Name" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="descriptio" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="timestamp" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="begin" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="end" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="RouteLen" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="Source" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_m" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="length_km" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="org_fid" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="distance" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="first_runn" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="last_runne" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Name"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="descriptio"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="timestamp"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="begin"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="end"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="RouteLen"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="Source"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_m"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="length_km"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="org_fid"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="distance"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="first_runn"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="last_runne"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="first_runn"/>
+        <constraint exp="" desc="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="179" name="begin" type="field"/>
-          <column hidden="0" width="-1" name="RouteLen" type="field"/>
-          <column hidden="0" width="-1" name="Source" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="Name" type="field"/>
-          <column hidden="0" width="-1" name="length_m" type="field"/>
-          <column hidden="0" width="-1" name="length_km" type="field"/>
-          <column hidden="0" width="-1" name="org_fid" type="field"/>
-          <column hidden="0" width="-1" name="first_runn" type="field"/>
-          <column hidden="0" width="-1" name="last_runne" type="field"/>
-          <column hidden="0" width="-1" name="descriptio" type="field"/>
-          <column hidden="0" width="-1" name="timestamp" type="field"/>
-          <column hidden="0" width="-1" name="end" type="field"/>
-          <column hidden="0" width="-1" name="distance" type="field"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19873,58 +19873,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -19932,7 +19932,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiLineString" autoRefreshEnabled="0" maxScale="0" labelsEnabled="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Line" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Line" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="0" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20006,326 +20006,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}" enabled="1">
+            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="190,178,151,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" enabled="1">
+            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" enabled="1">
+            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="136,127,108,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0" symbollevels="0">
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule label="Walking" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" is_animated="0" name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="0" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" enabled="1">
+            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" is_animated="0" name="1" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="1" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" enabled="1">
+            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" pass="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" enabled="1">
+            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" pass="0" locked="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" is_animated="0" name="@1@1" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol alpha="1" name="@1@1" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" pass="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" enabled="1">
+                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" pass="0" locked="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" name="name" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" name="size" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="size_unit" type="QString"/>
-                    <Option value="1" name="vertical_anchor_point" type="QString"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" is_animated="0" name="@@1@1@0" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" enabled="1">
+                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -20338,11 +20338,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20350,54 +20350,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" enabled="1">
+              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20405,12 +20405,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="2" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="2" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20418,17 +20418,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20437,34 +20437,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="type" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="type" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20496,12 +20496,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20509,7 +20509,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" wkbType="Point" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Point" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="Point" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Point" simplifyDrawingHints="0" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -20583,236 +20583,236 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" enabled="1">
+            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="145,82,45,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" enabled="1">
+            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" enabled="1">
+            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="104,59,32,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="label" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="15" useSubstitutions="0" fontWeight="63" fontUnderline="0" namedStyle="Semibold" fontFamily="Myriad Pro">
+          <text-style legendString="Aa" isExpression="0" namedStyle="Semibold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="15" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255" fieldName="label" useSubstitutions="0">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="3" placeDirectionSymbol="0"/>
-          <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MM" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="UnknownGeometry" dist="0" preserveRotation="1" quadOffset="4" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="0"/>
-          <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="1" fontLimitPixelSize="0" zIndex="0" upsidedownLabels="0" unplacedVisibility="0" scaleMin="0" scaleMax="0" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="2000"/>
+          <text-format multilineAlign="3" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="4" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MM" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering maxNumLabels="2000" zIndex="0" scaleMax="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
               <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -20820,54 +20820,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" enabled="1">
+              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20875,12 +20875,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="18" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20888,17 +20888,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20907,34 +20907,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="id" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20966,12 +20966,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20979,7 +20979,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyLocal="1" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" wkbType="MultiPolygon" autoRefreshEnabled="0" maxScale="0" labelsEnabled="1" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" legendPlaceholderImage="" simplifyAlgorithm="0" type="vector" geometry="Polygon" simplifyMaxScale="1" minScale="100000000">
+    <maplayer readOnly="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" minScale="100000000" simplifyAlgorithm="0" symbologyReferenceScale="-1" geometry="Polygon" simplifyDrawingHints="1" refreshOnNotifyMessage="" labelsEnabled="1" type="vector" autoRefreshEnabled="0" autoRefreshTime="0" simplifyDrawingTol="1" maxScale="0" legendPlaceholderImage="" simplifyMaxScale="1" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21045,7 +21045,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" minz="0" crs="" maxy="0" dimensions="2" maxz="0" maxx="0"/>
+          <spatial maxz="0" crs="" maxy="0" maxx="0" dimensions="2" minz="0" minx="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21070,267 +21070,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" endExpression="" startExpression="" limitMode="0" fixedDuration="0" accumulate="0" mode="0" durationField="" durationUnit="min" startField="" enabled="0">
+      <temporal durationUnit="min" startField="" endField="" startExpression="" fixedDuration="0" endExpression="" accumulate="0" mode="0" limitMode="0" durationField="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" clamping="Terrain" symbology="Line" extrusion="0" zscale="1" zoffset="0" binding="Centroid" extrusionEnabled="0" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
+      <elevation respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" symbology="Line" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" enabled="1">
+            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="125,139,143,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" enabled="1">
+            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" pass="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" enabled="1">
+            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" pass="0" locked="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="89,99,102,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" referencescale="-1" symbollevels="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" fieldName="label" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="31,120,180,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="0.90000000000000002" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" legendString="Aa" capitalization="0" isExpression="0" fontSize="8" useSubstitutions="0" fontWeight="75" fontUnderline="0" namedStyle="Bold" fontFamily="Myriad Pro">
+              <text-style legendString="Aa" isExpression="0" namedStyle="Bold" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="0.90000000000000002" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="31,120,180,255" fieldName="label" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferSize="0.75"/>
-                <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-                <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0.5" shapeBorderWidthUnit="MM" shapeSizeX="0.75" shapeOffsetY="-0.14999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="1" shapeBorderWidth="0.75" shapeRadiiUnit="MM" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeSizeY="0.29999999999999999">
-                  <symbol frame_rate="10" is_animated="0" name="markerSymbol" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.75"/>
+                <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+                <background shapeSizeType="0" shapeSizeX="0.75" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="31,120,206,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeOffsetUnit="MM" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="1" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="-0.14999999999999999" shapeFillColor="255,255,255,204">
+                  <symbol alpha="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="196,60,57,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                    <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" name="joinstyle" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" reverseDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" useMaxLineLengthForAutoWrap="1" multilineAlign="1" placeDirectionSymbol="0"/>
-              <placement geometryGenerator="" overrunDistanceUnit="MM" repeatDistanceUnits="MM" priority="5" yOffset="0" repeatDistance="0" geometryGeneratorType="PointGeometry" centroidInside="0" placementFlags="10" maxCurvedCharAngleIn="25" distUnits="MM" lineAnchorClipping="0" allowDegraded="0" overlapHandling="PreventOverlap" offsetUnits="MapUnit" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" layerType="PolygonGeometry" dist="0" preserveRotation="1" quadOffset="1" rotationUnit="AngleDegrees" maxCurvedCharAngleOut="-25" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" lineAnchorType="0" distMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" offsetType="0" xOffset="1"/>
-              <rendering obstacle="1" labelPerPart="0" limitNumLabels="0" scaleVisibility="0" fontMaxPixelSize="10000" mergeLines="0" obstacleFactor="0.76000000000000001" fontLimitPixelSize="0" zIndex="5" upsidedownLabels="0" unplacedVisibility="0" scaleMin="1" scaleMax="10000000" obstacleType="0" minFeatureSize="0" fontMinPixelSize="3" drawLabels="1" maxNumLabels="6"/>
+              <text-format multilineAlign="1" decimals="3" wrapChar="" addDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" plussign="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">"/>
+              <placement layerType="PolygonGeometry" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" polygonPlacementFlags="2" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" quadOffset="1" overrunDistance="0" distUnits="MM" preserveRotation="1" maxCurvedCharAngleOut="-25" centroidWhole="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" fitInPolygonOnly="0" lineAnchorClipping="0" centroidInside="0" offsetType="0" geometryGenerator="" geometryGeneratorType="PointGeometry" offsetUnits="MapUnit" geometryGeneratorEnabled="0" repeatDistance="0" lineAnchorPercent="0.5" placementFlags="10" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" lineAnchorType="0" overlapHandling="PreventOverlap" priority="5" dist="0" placement="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering maxNumLabels="6" zIndex="5" scaleMax="10000000" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3" unplacedVisibility="0" scaleMin="1" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" obstacleType="0" limitNumLabels="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
                   <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -21339,17 +21339,17 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
           <Option name="dualview/previewExpressions" type="List">
-            <Option 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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -21357,54 +21357,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" backgroundColor="#ffffff" lineSizeType="MM" backgroundAlpha="255" penWidth="0" barWidth="5" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleBasedVisibility="0" width="15" diagramOrientation="Up" penAlpha="255" sizeType="MM" penColor="#000000" scaleDependency="Area" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" minimumSize="0" showAxis="0" spacing="0" labelPlacementMethod="XHeight">
-          <fontProperties underline="0" bold="0" strikethrough="0" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute label="" field="" colorOpacity="1" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory minimumSize="0" lineSizeScale="3x:0,0,0,0,0,0" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" enabled="0" lineSizeType="MM" opacity="1" labelPlacementMethod="XHeight" scaleBasedVisibility="0" diagramOrientation="Up" spacingUnit="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" showAxis="0" width="15" penWidth="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundAlpha="255" direction="1" spacing="0" penAlpha="255" height="15" scaleDependency="Area" barWidth="5" rotationOffset="270">
+          <fontProperties strikethrough="0" style="" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0"/>
+          <attribute colorOpacity="1" color="#000000" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" enabled="1">
+              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21412,12 +21412,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" placement="0" zIndex="0" linePlacementFlags="2" obstacle="0" priority="0" showAll="1">
+      <DiagramLayerSettings dist="0" priority="0" obstacle="0" placement="0" showAll="1" zIndex="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21425,53 +21425,53 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21480,11 +21480,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -21494,38 +21494,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="table_set" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default 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"/>
       </defaults>
       <constraints>
-        <constraint field="id" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="table_set" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="label" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="races" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
-        <constraint field="day" exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="id"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="table_set"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="label"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="races"/>
+        <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <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=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="table_set"/>
+        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" desc="" field="races"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </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" width="-1" name="id" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="table_set" type="field"/>
-          <column hidden="0" width="-1" name="label" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="130" name="races" type="field"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21557,25 +21557,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="label" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="table_set" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -21778,7 +21778,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes/20230902 - Gun Run 2023 - Routes 1.4.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230902 - Gun Run 2023 - Marshal Plan 1.3.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -21947,367 +21947,367 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Cones" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <visibility-preset name="Cones" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" 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="Fencing and Cones"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" 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 visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" 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="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" 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 visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" 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 visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22330,90 +22330,90 @@ def my_form_open(dialog, layer, feature):
     </contact>
     <links/>
     <dates>
-      <date value="2000-01-01T00:00:00" type="Created"/>
+      <date type="Created" value="2000-01-01T00:00:00"/>
     </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" enabled="1">
+          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" enabled="1">
+            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22421,15 +22421,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem sectionY="0" position="158.226,6.0007,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="132.391" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="158.226,6.0007,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="132.391,187.018,mm" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}">
+      <LayoutItem templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="158.226,6.0007,mm" sectionHeight="184.8" background="false" visibility="1" size="132.391,187.018,mm" frame="false" frameJoinStyle="miter" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65647" sectionY="0" id="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" position="158.226,6.0007,mm" hidePageIfEmpty="0" zValue="6" referencePoint="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -22437,15 +22437,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="20.4703,32.2333,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" outlineWidthM="0.1,mm" id="" titleAlignment="1" zValue="5" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="bevel" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="128.508,3.98741,mm" title="" boxSpace="2" positionOnPage="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}">
+      <LayoutItem symbolHeight="4" frame="true" position="128.508,3.98741,mm" boxSpace="2" columnCount="1" frameJoinStyle="bevel" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="5" wmsLegendWidth="50" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" itemRotation="0" size="20.4703,32.2333,mm" maxSymbolSize="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" positionLock="true" outlineWidthM="0.1,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="128.508,3.98741,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="128" blue="128" alpha="255" red="128"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -22456,242 +22456,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.8805579999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="11" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="11" multilineHeight="4.8805579999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.1750019999999992" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="4.1750019999999992" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="3.8222239999999998" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="8" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="8" multilineHeight="3.8222239999999998" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -22701,17 +22701,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -22719,166 +22719,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem position="98.7828,149.027,mm" id="Inset map" positionLock="true" blendMode="0" followPresetName="Marshal map - inset" excludeFromExports="0" drawCanvasItems="false" zValue="3" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.2,mm" positionOnPage="98.7828,149.027,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="56.5192,54.5647,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="98.7828,149.027,mm" background="true" visibility="1" size="56.5192,54.5647,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal map - inset" id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" zValue="3" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.2,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91073582826823696" xmax="18.39607548048533303" xmin="18.3917833749645645" ymax="-33.90659215121308279"/>
+        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" enabled="1">
+              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" enabled="1">
+              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -22886,34 +22886,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview position="3" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview show="1" blendMode="0" centered="1" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" enabled="1">
+            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22921,9 +22921,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -22931,173 +22931,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="3.53,6.0007,mm" id="Main map" positionLock="true" blendMode="0" followPresetName="Marshal map - main" excludeFromExports="0" drawCanvasItems="false" zValue="2" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="3.53,6.0007,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="142,187.018,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="3.53,6.0007,mm" background="false" visibility="1" size="142,187.018,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal map - main" id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90934028818313095" xmax="18.3944429313991229" xmin="18.39341592405077463" ymax="-33.90798769129818879"/>
+        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" enabled="1">
+              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" enabled="1">
+              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -23105,28 +23105,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="246.665,178.41,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="26.6623" zValue="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" anchorPoint="0" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="246.665,178.41,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2023_500.png" size="47.1065,27.6,mm" type="65640" pictureWidth="47.1065" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgFillColor="255,255,255,255" file="../GunRun2023_500.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="0" mapUuid="" positionOnPage="246.665,178.41,mm" pictureHeight="26.6623" background="false" visibility="1" size="47.1065,27.6,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" resizeMode="0" zValue="1" referencePoint="0" northMode="0" pictureWidth="47.1065" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23134,14 +23134,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" 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;" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" url="" resizeMode="0" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" 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" maxBreakDistance="10">
+        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23151,112 +23151,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="bool"/>
-          <Option value="0" name="imageCropMarginBottom" type="int"/>
-          <Option value="0" name="imageCropMarginLeft" type="int"/>
-          <Option value="0" name="imageCropMarginRight" type="int"/>
-          <Option value="0" name="imageCropMarginTop" type="int"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="bool"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="bool" value="true"/>
+          <Option name="imageCropMarginBottom" type="int" value="0"/>
+          <Option name="imageCropMarginLeft" type="int" value="0"/>
+          <Option name="imageCropMarginRight" type="int" value="0"/>
+          <Option name="imageCropMarginTop" type="int" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="bool" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="bool" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" filterFeatures="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" enabled="1"/>
+      <Atlas sortKey="&quot;id&quot;" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_positions" pageNameExpression="&quot;position&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" enabled="1">
+          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" enabled="1">
+            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23264,21 +23264,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem northOffset="0" position="286.027,2,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="7.97477" zValue="4" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" anchorPoint="0" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="286.027,2,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="arrows/NorthArrow_11.svg" size="9.45865,11,mm" type="65640" pictureWidth="6.31767" pictureRotation="330" mode="0">
+      <LayoutItem templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgFillColor="255,255,255,255" file="arrows/NorthArrow_11.svg" mode="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionOnPage="286.027,2,mm" pictureHeight="7.97477" background="false" visibility="1" size="9.45865,11,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="330" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="6.31767" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23286,126 +23286,126 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="285.027,205.886,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="285.027,205.886,mm" frameJoinStyle="miter" background="false" itemRotation="270" size="142.543,10.3185,mm" valign="64" type="65641" labelText="[%upper( &quot;area&quot; )%]">
+      <LayoutItem templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="270" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="285.027,205.886,mm" valign="64" background="false" visibility="1" size="142.543,10.3185,mm" frame="false" frameJoinStyle="miter" labelText="[%upper( &quot;area&quot; )%]" type="65641" id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="1" size="145.54,16.2165,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="26.3519" lineCapStyle="square" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="3" lineJoinStyle="miter" style="Single Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="4" numMapUnitsPerScaleBarUnit="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" maxBarWidth="150" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="100" itemRotation="0" minBarWidth="50" height="3" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="7,189.669,mm" outlineWidth="0.3" positionOnPage="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="miter" numSubdivisions="1" frame="false" position="7,189.669,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="3" blendMode="0" id="" height="3" numSegments="4" zValue="2" maxBarWidth="150" excludeFromExports="0" boxContentSpace="1" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="50" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" itemRotation="0" segmentSizeMode="1" size="145.54,16.2165,mm" unitType="meters" style="Single Box" subdivisionsHeight="1.5" segmentMillimeters="26.3519" labelVerticalPlacement="0" numUnitsPerSegment="100" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="7,189.669,mm" outlineWidth="0.3" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -23413,349 +23413,349 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" enabled="1">
+            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" enabled="1">
+            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}" enabled="1">
+            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" enabled="1">
+            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}" enabled="1">
+            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="7,5.5,mm" id="" positionLock="true" blendMode="0" followPresetName="Start/Finish" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="7,5.5,mm" frameJoinStyle="miter" background="false" mapRotation="330" itemRotation="0" keepLayerSet="false" size="278.027,180.318,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="7,5.5,mm" background="false" visibility="1" size="278.027,180.318,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Start/Finish" id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="330" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" enabled="1">
+              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" enabled="1">
+              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23772,58 +23772,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -23831,117 +23831,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" sortKey="area" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" enabled="1"/>
+      <Atlas sortKey="area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="start_finish_area" pageNameExpression="&quot;area&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" enabled="1">
+          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" enabled="1">
+            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23949,15 +23949,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="38.1563,67.2879,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="11" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="0" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="256.808,5.21277,mm" title="" boxSpace="2" positionOnPage="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}">
+      <LayoutItem symbolHeight="4" frame="true" position="256.808,5.21277,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="11" wmsLegendWidth="50" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" itemRotation="0" size="38.1563,67.2879,mm" maxSymbolSize="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="0" positionOnPage="256.808,5.21277,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23968,242 +23968,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24213,33 +24213,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24247,77 +24247,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="148.46,6.45211,mm" valign="32" type="65641" labelText="FENCING: [% &quot;name&quot; %]">
+      <LayoutItem templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,191.188,mm" valign="32" background="false" visibility="1" size="148.46,6.45211,mm" frame="false" frameJoinStyle="miter" labelText="FENCING: [% &quot;name&quot; %]" type="65641" id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" zValue="10" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="182.723,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="56.3557" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.3557,6.45237,mm" sectionHeight="5.76" type="65647" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}">
+      <LayoutItem templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" sectionWidth="56.3557" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" background="false" visibility="1" size="56.3557,6.45237,mm" frame="false" frameJoinStyle="miter" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65647" sectionY="0" id="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" position="182.723,191.188,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24325,269 +24325,269 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="209.146,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="26.8205,6.82826,mm" valign="32" type="65641" labelText="REVISION 3.0">
+      <LayoutItem templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="209.146,198.083,mm" valign="32" background="false" visibility="1" size="26.8205,6.82826,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 3.0" type="65641" id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="62.6706,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.1638,7.07327,mm" valign="32" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="62.6706,198.083,mm" valign="32" background="false" visibility="1" size="51.1638,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" type="65641" id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="116.805,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="64.7594,7.10512,mm" valign="32" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="116.805,198.083,mm" valign="32" background="false" visibility="1" size="64.7594,7.10512,mm" frame="false" frameJoinStyle="miter" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" type="65641" id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="52.7903,7.07327,mm" valign="32" type="65641" labelText="Page [% @atlas_featurenumber %]">
+      <LayoutItem templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,198.083,mm" valign="32" background="false" visibility="1" size="52.7903,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Page [% @atlas_featurenumber %]" type="65641" id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.098,175.353,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="29.8354" zValue="4" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2022_250.png" size="49.3143,29.8354,mm" type="65640" pictureWidth="29.6535" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgFillColor="255,255,255,255" file="../GunRun2022_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.098,175.353,mm" pictureHeight="29.8354" background="false" visibility="1" size="49.3143,29.8354,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="29.6535" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24595,111 +24595,111 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="6.91779,197.79,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="232.01,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.91779,197.79,mm" background="false" visibility="1" size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" enabled="1">
+          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="0.2" size="109.51,15.8378,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="33.2496" lineCapStyle="square" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="1" lineJoinStyle="round" style="Double Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="2" numMapUnitsPerScaleBarUnit="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" maxBarWidth="100" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="20" itemRotation="0" minBarWidth="25" height="2" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="6.76779,2.8482,mm" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="round" numSubdivisions="1" frame="false" position="6.76779,2.8482,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="1" blendMode="0" id="" height="2" numSegments="2" zValue="2" maxBarWidth="100" excludeFromExports="0" boxContentSpace="0.2" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="25" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" itemRotation="0" segmentSizeMode="1" size="109.51,15.8378,mm" unitType="meters" style="Double Box" subdivisionsHeight="1.5" segmentMillimeters="33.2496" labelVerticalPlacement="0" numUnitsPerSegment="20" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="6.76779,2.8482,mm" outlineWidth="0.2" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -24707,268 +24707,268 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" enabled="1">
+            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" enabled="1">
+            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" enabled="1">
+            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" enabled="1">
+            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" enabled="1">
+            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="6.76779,9.35102,mm" id="" positionLock="true" blendMode="0" followPresetName="Fencing" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="283.418,180.92,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelMargin="0,mm" positionLock="true" opacity="0.9" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" visibility="1" size="283.418,180.92,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Fencing" id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90817940102677852" xmax="18.40522072458854552" xmin="18.40368928312333452" ymax="-33.90720180625849167"/>
+        <Extent xmax="18.40522072458854552" xmin="18.40368928312333452" ymin="-33.90817940102677852" ymax="-33.90720180625849167"/>
         <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>
@@ -24983,92 +24983,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" enabled="1">
+              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" enabled="1">
+              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25085,58 +25085,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25144,21 +25144,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" useSmartBreaks="true" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25168,250 +25168,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_and_cone_groups" sortKey="&quot;group&quot;" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" 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" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="fence_and_cone_groups" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="9" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="9" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}" enabled="1">
+          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" enabled="1">
+            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="4.43449,186.634,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.43449,186.634,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="83.9998,10.4638,mm" valign="64" type="65641" labelText="Directions to Start of Race">
+      <LayoutItem templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.43449,186.634,mm" valign="64" background="false" visibility="1" size="83.9998,10.4638,mm" frame="false" frameJoinStyle="miter" labelText="Directions to Start of Race" type="65641" id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="4.43449,197.498,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.43449,197.498,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="48.2923,9.511,mm" valign="32" type="65641" labelText="Gun Run">
+      <LayoutItem templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.43449,197.498,mm" valign="32" background="false" visibility="1" size="48.2923,9.511,mm" frame="false" frameJoinStyle="miter" labelText="Gun Run" type="65641" id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="59.0766,76,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="6" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="5" maxSymbolSize="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" wrapChar="" rasterBorderWidth="0" symbolWidth="9" columnSpace="0" columnCount="1" legendFilterByMap="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="round" equalColumnWidth="0" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="10.096,10.8563,mm" title="" boxSpace="2" positionOnPage="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}">
+      <LayoutItem symbolHeight="5" frame="true" position="10.096,10.8563,mm" boxSpace="2" columnCount="1" frameJoinStyle="round" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="6" wmsLegendWidth="50" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="0" opacity="1" wmsLegendHeight="25" equalColumnWidth="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" itemRotation="0" size="59.0766,76,mm" maxSymbolSize="0" legendFilterByMap="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" positionLock="false" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="10.096,10.8563,mm" referencePoint="0" minSymbolSize="0" symbolWidth="9">
         <FrameColor green="139" blue="139" alpha="255" red="139"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25422,242 +25422,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="7.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="7.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="6.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="6.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2.5" marginLeft="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="3" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="6.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -25667,32 +25667,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Ask Me">
+          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -25700,145 +25700,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="221.862,190.027,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="221.862,190.027,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="27.7839,6.871,mm" valign="32" type="65641" labelText="REVISION 1.0">
+      <LayoutItem templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="221.862,190.027,mm" valign="32" background="false" visibility="1" size="27.7839,6.871,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.0" type="65641" id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="197.975,197.498,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="197.975,197.498,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" marginX="1" marginY="1" positionLock="false" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="197.975,197.498,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" zValue="4" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="249.646,179.724,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" positionLock="false" blendMode="0" excludeFromExports="0" pictureHeight="24.3824" zValue="3" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="249.646,179.724,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="42.9838,24.3824,mm" type="65640" pictureWidth="24.2337" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="249.646,179.724,mm" pictureHeight="24.3824" background="false" visibility="1" size="42.9838,24.3824,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="24.2337" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25846,85 +25846,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="4.58449,197.248,mm" shapeType="1" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="4.58449,197.248,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="244.912,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="4.58449,197.248,mm" background="false" visibility="1" size="244.912,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{25dc84af-8724-465b-a42c-c6c013132998}" enabled="1">
+          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="4.43449,6.411,mm" id="" positionLock="false" blendMode="0" followPresetName="Ask Me" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="4.43449,6.411,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="288.007,183.616,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" labelMargin="0,mm" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="4.43449,6.411,mm" background="true" visibility="1" size="288.007,183.616,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Ask Me" id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
         <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>
@@ -25939,149 +25939,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" enabled="1">
+              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" enabled="1">
+              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26089,318 +26089,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0" pageNameExpression="" sortFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0" sortFeatures="0" pageNameExpression="" filterFeatures="0" coverageLayer="" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" enabled="1">
+          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" enabled="1">
+            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="200.171,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="200.171,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.8714,mm" valign="32" type="65641" labelText="REVISION 1.4">
+      <LayoutItem templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="200.171,199.082,mm" valign="32" background="false" visibility="1" size="61.5373,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.4" type="65641" id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" zValue="13" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.7863,192.073,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.7863,192.073,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.60801,mm" valign="64" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]">
+      <LayoutItem templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.7863,192.073,mm" valign="64" background="false" visibility="1" size="61.5373,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Gun Run 2023: [%&quot;Source&quot;%]" type="65641" id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" zValue="12" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.7863,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.7863,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="61.5373,6.60801,mm" valign="32" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM Dog|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]">
+      <LayoutItem templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.7863,199.082,mm" valign="32" background="false" visibility="1" size="61.5373,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM Dog|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" type="65641" id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" zValue="11" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="16.8993" zValue="10" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2023_250.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="29.7523" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgFillColor="255,255,255,255" file="../GunRun2023_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionOnPage="262.196,188.218,mm" pictureHeight="16.8993" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" resizeMode="0" zValue="10" referencePoint="0" northMode="0" pictureWidth="29.7523" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26408,464 +26408,464 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.57644,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.57644,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.982,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.57644,198.832,mm" background="false" visibility="1" size="251.982,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" zValue="9" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" enabled="1">
+          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="8.21644,4.09761,mm" id="Trail Finish" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="8.21644,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="109.221,188.689,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="8.21644,4.09761,mm" background="true" visibility="1" size="109.221,188.689,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="8.21644,4.09761,mm" zValue="8" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93242806047424409" xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="113.002,2.39423,mm" id="Trail Start" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="113.002,2.39423,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="179.156,191.505,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="113.002,2.39423,mm" background="true" visibility="1" size="179.156,191.505,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="113.002,2.39423,mm" zValue="7" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95791657202656921" xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="5.86559,4.09761,mm" id="Left inset 21KM" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="false" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="67.7828,166.874,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" visibility="1" size="67.7828,166.874,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" zValue="6" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="133.191,119.125,mm" id="Bottom inset 21KM" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="133.191,119.125,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="113.3,76.1023,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="133.191,119.125,mm" background="true" visibility="1" size="113.3,76.1023,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" zValue="5" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="34" blue="144" alpha="255" red="103"/>
         <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="19.6693,7.89412,mm" id="End inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="19.6693,7.89412,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="68.3676,117.12,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="19.6693,7.89412,mm" background="true" visibility="0" size="68.3676,117.12,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" zValue="4" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" xmin="18.4044900556177744" ymax="-33.90099106513847005"/>
+        <Extent xmax="18.41240136424316276" xmin="18.4044900556177744" ymin="-33.91454383501641701" ymax="-33.90099106513847005"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="170.062,49.6297,mm" id="Start inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="170.062,49.6297,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="63.655,88.3012,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="170.062,49.6297,mm" background="true" visibility="0" size="63.655,88.3012,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" zValue="3" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" xmin="18.41445559427620893" ymax="-33.94253141264477591"/>
+        <Extent xmax="18.4185691326545431" xmin="18.41445559427620893" ymin="-33.94823764719958348" ymax="-33.94253141264477591"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="200.321,125.314,mm" id="Contour inset Trail" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" referencePoint="0" groupUuid="" visibility="0" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="200.321,125.314,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="75.8756,69.7635,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="200.321,125.314,mm" background="true" visibility="0" size="75.8756,69.7635,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" xmin="18.41234259163472942" ymax="-33.94692690566557047"/>
+        <Extent xmax="18.42332635419156972" xmin="18.41234259163472942" ymin="-33.95702588572736147" ymax="-33.94692690566557047"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="8.14144,4.02261,mm" id="Main Map" positionLock="true" blendMode="0" followPresetName="Routes" excludeFromExports="0" drawCanvasItems="true" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="8.14144,4.02261,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.732,188.839,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="true" mapFlags="0" positionOnPage="8.14144,4.02261,mm" background="true" visibility="1" size="282.732,188.839,mm" frame="true" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Routes" id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="8.14144,4.02261,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90999999999999659" xmax="18.41740108016482935" xmin="18.39900000000000091" ymax="-33.89770979439427379"/>
+        <Extent xmax="18.41685118589651893" xmin="18.37800000000000011" ymin="-33.92300000000000182" ymax="-33.89705103078635773"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" enabled="1">
+              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" enabled="1">
+              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26873,40 +26873,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview position="3" inverted="0" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview show="1" blendMode="0" centered="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties" type="Map">
                   <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" enabled="1">
+            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26914,9 +26914,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26924,115 +26924,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
+        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="all_routes" pageNameExpression="&quot;Distance&quot;" coverageLayerProvider="ogr" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}" enabled="1">
+          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="594,841,mm" type="65638">
+        <LayoutItem templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="594,841,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}" enabled="1">
+            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27040,15 +27040,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="4,4,mm" frame="false" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="8" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="25.5925,18.7971,mm" title="" boxSpace="2" positionOnPage="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}">
+      <LayoutItem symbolHeight="4" frame="false" position="25.5925,18.7971,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="8" wmsLegendWidth="50" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" itemRotation="0" size="4,4,mm" maxSymbolSize="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="25.5925,18.7971,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27059,242 +27059,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="6.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27304,17 +27304,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes20170907054841602" name="all_routes" legend_exp="">
+            <layer-tree-layer id="all_routes20170907054841602" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27322,207 +27322,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="5.2963,808.939,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.2963,808.939,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="91.9494,15.0649,mm" valign="64" type="65641" labelText="MARSHAL POSITIONS">
+      <LayoutItem templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.2963,808.939,mm" valign="64" background="false" visibility="1" size="91.9494,15.0649,mm" frame="false" frameJoinStyle="miter" labelText="MARSHAL POSITIONS" type="65641" id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="430.403,825.052,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="430.403,825.052,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.6212,15.3656,mm" valign="32" type="65641" labelText="REVISION 1.2">
+      <LayoutItem templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="430.403,825.052,mm" valign="32" background="false" visibility="1" size="56.6212,15.3656,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.2" type="65641" id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="372.175,808.942,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="372.175,808.942,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="114.848,15.0635,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="372.175,808.942,mm" valign="64" background="false" visibility="1" size="114.848,15.0635,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" zValue="4" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="489.557,775.395,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="63.9757" zValue="3" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="489.557,775.395,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="100.498,63.9757,mm" type="65640" pictureWidth="63.5856" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="489.557,775.395,mm" pictureHeight="63.9757" background="false" visibility="1" size="100.498,63.9757,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="63.5856" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27530,199 +27530,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="5.4463,824.155,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.4463,824.155,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="481.428,0.606138,mm" type="65643">
+      <LayoutItem templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.4463,824.155,mm" background="false" visibility="1" size="481.428,0.606138,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" enabled="1">
+          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="3.94474,5.25965,mm" id="" positionLock="true" blendMode="0" followPresetName="Marshal plan" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="3.94474,5.25965,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="584.759,811.213,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="3.94474,5.25965,mm" background="true" visibility="1" size="584.759,811.213,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal plan" id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" sortKey="page" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" enabled="1"/>
+      <Atlas sortKey="page" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="complete_marshal_overview" pageNameExpression="&quot;page&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" enabled="1">
+          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" enabled="1">
+            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="34.45,40.8,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="15" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="0" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="244.484,130.172,mm" title="" boxSpace="2" positionOnPage="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}">
+      <LayoutItem symbolHeight="4" frame="true" position="244.484,130.172,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="15" wmsLegendWidth="50" rasterBorder="1" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" itemRotation="0" size="34.45,40.8,mm" maxSymbolSize="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="244.484,130.172,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27730,242 +27730,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27975,15 +27975,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Residents Access">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27991,207 +27991,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="9.37446,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="194.851,7.272,mm" valign="64" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS">
+      <LayoutItem templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.37446,191.81,mm" valign="64" background="false" visibility="1" size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" labelText="ACCESS ROUTES FOR RESIDENTS" type="65641" id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="204.225,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="57.4836,6.8714,mm" valign="64" type="65641" labelText="REVISION 1.1">
+      <LayoutItem templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="204.225,191.81,mm" valign="64" background="false" visibility="1" size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.1" type="65641" id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="210.038,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="210.038,199.082,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="17.4718" zValue="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="17.3653" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionOnPage="262.196,188.218,mm" pictureHeight="17.4718" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="17.3653" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28199,100 +28199,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.59946,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.959,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.59946,198.832,mm" background="false" visibility="1" size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" enabled="1">
+          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="5.86559,4.09761,mm" id="" positionLock="true" blendMode="0" followPresetName="Access Routes" excludeFromExports="0" drawCanvasItems="false" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="67.7828,166.874,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.86559,4.09761,mm" background="true" visibility="1" size="67.7828,166.874,mm" frame="true" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Access Routes" id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" zValue="2" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
         <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>
@@ -28307,149 +28307,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" enabled="1">
+              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" enabled="1">
+              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28457,45 +28457,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem position="9.44946,9.08557,mm" id="" positionLock="true" blendMode="0" followPresetName="Access Routes" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="true" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.012,175.592,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="9.44946,9.08557,mm" background="true" visibility="1" size="282.012,175.592,mm" frame="true" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Access Routes" id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
         <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>
@@ -28510,149 +28510,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}" enabled="1">
+              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" enabled="1">
+              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28660,318 +28660,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" enabled="1">
+          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}" enabled="1">
+            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem htmlState="0" position="9.37446,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="194.851,7.272,mm" valign="64" type="65641" labelText="Access to P9 Parking and VIP Tent">
+      <LayoutItem templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.37446,191.81,mm" valign="64" background="false" visibility="1" size="194.851,7.272,mm" frame="false" frameJoinStyle="miter" labelText="Access to P9 Parking and VIP Tent" type="65641" id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="204.225,191.81,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="57.4836,6.8714,mm" valign="64" type="65641" labelText="REVISION 1.0">
+      <LayoutItem templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="204.225,191.81,mm" valign="64" background="false" visibility="1" size="57.4836,6.8714,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.0" type="65641" id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="210.038,199.082,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.6706,6.60801,mm" valign="64" type="65641" labelText="Sunday, 20 October 2019">
+      <LayoutItem templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="210.038,199.082,mm" valign="64" background="false" visibility="1" size="51.6706,6.60801,mm" frame="false" frameJoinStyle="miter" labelText="Sunday, 20 October 2019" type="65641" id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="262.196,188.218,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="17.4718" zValue="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" anchorPoint="4" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../Gun_Run_Logo.png" size="29.7523,17.4718,mm" type="65640" pictureWidth="17.3653" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgFillColor="255,255,255,255" file="../Gun_Run_Logo.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="4" mapUuid="" positionOnPage="262.196,188.218,mm" pictureHeight="17.4718" background="false" visibility="1" size="29.7523,17.4718,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="17.3653" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28979,85 +28979,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="9.59946,198.832,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="251.959,0.1,mm" type="65643">
+      <LayoutItem templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="9.59946,198.832,mm" background="false" visibility="1" size="251.959,0.1,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{025604c1-b118-4f15-b140-54c9145260c4}" enabled="1">
+          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="9.44946,7.25098,mm" id="" positionLock="false" blendMode="0" followPresetName="" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.15,mm" positionOnPage="9.44946,7.25098,mm" frameJoinStyle="round" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="282.012,182.649,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="false">
+      <LayoutItem templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" labelMargin="0,mm" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="9.44946,7.25098,mm" background="true" visibility="1" size="282.012,182.649,mm" frame="false" frameJoinStyle="round" keepLayerSet="false" type="65639" followPreset="false" followPresetName="" id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.15,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
         <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>
@@ -29072,149 +29072,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="0" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="0" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="0" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="0" show="0" gridFrameWidth="2" unit="0" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="0" offsetX="0" position="3" bottomAnnotationDisplay="0" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="0" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="0" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="0" topAnnotationDisplay="0" unit="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="0" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="0" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" enabled="1">
+              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" enabled="1">
+              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29222,108 +29222,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" enabled="1">
+          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,420,mm" type="65638">
+        <LayoutItem templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,420,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" enabled="1">
+            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29331,15 +29331,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem sectionY="0" position="112.086,406.476,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="23.5967" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="112.086,406.476,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="23.5967,8.3142,mm" sectionHeight="7.2" type="65647" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}">
+      <LayoutItem templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" sectionWidth="23.5967" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="112.086,406.476,mm" sectionHeight="8.3142" background="false" visibility="1" size="23.5967,8.3142,mm" frame="false" frameJoinStyle="miter" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65647" sectionY="0" id="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" position="112.086,406.476,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29347,139 +29347,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="214.292,406.874,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" opacity="1" marginY="1" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="214.292,406.874,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="27.7839,7.51682,mm" valign="32" type="65641" labelText="REVISION 1.2">
+      <LayoutItem templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="214.292,406.874,mm" valign="32" background="false" visibility="1" size="27.7839,7.51682,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 1.3" type="65641" id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="5.69321,398.344,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.69321,398.344,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="45.1194,8.13137,mm" valign="64" type="65641" labelText="MARSHAL POSITIONS">
+      <LayoutItem templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" htmlState="0" marginX="0" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.69321,398.344,mm" valign="64" background="false" visibility="1" size="45.1194,8.13137,mm" frame="false" frameJoinStyle="miter" labelText="MARSHAL POSITIONS" type="65641" id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="21.8263,33.2917,mm" frame="false" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="6" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="1" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="15.6525,12.5708,mm" title="" boxSpace="2" positionOnPage="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}">
+      <LayoutItem symbolHeight="4" frame="false" position="15.6525,12.5708,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="6" wmsLegendWidth="50" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" itemRotation="0" size="22.2406,33.2917,mm" maxSymbolSize="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="1" positionOnPage="15.6525,12.5708,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29490,242 +29490,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="6.6444479999999997" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="16" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="16" multilineHeight="6.6444479999999997" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.9388920000000001" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="14" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="14" multilineHeight="5.9388920000000001" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29735,19 +29735,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="group" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" type="QString" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29755,15 +29755,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="5.69321,406.988,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="118.192" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="5.69321,406.988,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="118.192,7.80192,mm" sectionHeight="7.2" type="65647" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}">
+      <LayoutItem templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" sectionWidth="118.192" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.69321,406.988,mm" sectionHeight="7.80192" background="false" visibility="1" size="118.192,7.80192,mm" frame="false" frameJoinStyle="miter" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65647" sectionY="0" id="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" position="5.69321,406.988,mm" hidePageIfEmpty="0" zValue="5" referencePoint="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29771,15 +29771,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="148.501,398.344,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="4" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="93.5757" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="148.501,398.344,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="93.5757,8.13167,mm" sectionHeight="7.2" type="65647" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}">
+      <LayoutItem templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" sectionWidth="93.5757" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="148.501,398.344,mm" sectionHeight="8.13167" background="false" visibility="1" size="93.5757,8.13167,mm" frame="false" frameJoinStyle="miter" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65647" sectionY="0" id="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" position="148.501,398.344,mm" hidePageIfEmpty="0" zValue="4" referencePoint="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29787,21 +29787,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.319,382.696,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="27.9119" zValue="3" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.319,382.696,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../../Gun Run 2023.png" size="49.3143,31.2967,mm" type="65640" pictureWidth="49.3143" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgFillColor="255,255,255,255" file="../../Gun Run 2023.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.319,382.696,mm" pictureHeight="27.9119" background="false" visibility="1" size="49.3143,31.2967,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" resizeMode="0" zValue="3" referencePoint="0" northMode="0" pictureWidth="49.3143" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29809,101 +29809,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="5.84321,406.626,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="5.84321,406.626,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="236.083,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="5.84321,406.626,mm" background="false" visibility="1" size="236.083,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" zValue="2" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" enabled="1">
+          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem position="5.03,5.9483,mm" id="" positionLock="true" blendMode="0" followPresetName="Marshal plan" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="5.03,5.9483,mm" frameJoinStyle="miter" background="true" mapRotation="0" itemRotation="0" keepLayerSet="false" size="286.94,392.396,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" labelMargin="0,mm" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="5.03,5.9483,mm" background="true" visibility="1" size="286.94,392.396,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Marshal plan" id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9598985186662361" xmax="18.42424810950425851" xmin="18.4073565023609298" ymax="-33.93679891595140674"/>
+        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="Page [% &quot;page&quot; %] " uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
-        <childFrame uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" useSmartBreaks="true" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" stylesheetEnabled="true" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29911,14 +29911,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '5KM Fun Run &amp; 21KM'&#xa;END&#xa;%]&lt;/strong>" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
-        <childFrame uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" useSmartBreaks="true" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '5KM Fun Run &amp; 21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29926,14 +29926,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" useSmartBreaks="true" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29943,99 +29943,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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_2ab98e38_c6e4_44de_b9ec_d694b527c013" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" sortKey="page" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" enabled="1"/>
+      <Atlas sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_overviews" pageNameExpression="&quot;page&quot;" coverageLayerProvider="ogr" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
-      <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm"/>
+    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" enabled="1">
+          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem position="0,0,mm" id="" positionLock="false" blendMode="0" excludeFromExports="0" zValue="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" frameJoinStyle="miter" background="true" itemRotation="0" size="297,210,mm" type="65638">
+        <LayoutItem templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="0,0,mm" background="true" visibility="1" size="297,210,mm" frame="false" frameJoinStyle="miter" type="65638" id="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" position="0,0,mm" zValue="0" referencePoint="0" outlineWidthM="0.3,mm">
           <FrameColor green="0" blue="0" alpha="255" red="0"/>
           <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" enabled="1">
+            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30043,15 +30043,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" type="65642" legendFilterByAtlas="0" wmsLegendWidth="50" size="38.1563,53.7608,mm" frame="true" minSymbolSize="0" rasterBorder="1" splitLayer="0" wmsLegendHeight="25" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" outlineWidthM="0.3,mm" id="" titleAlignment="1" zValue="11" rasterBorderColor="0,0,0,255" opacity="1" referencePoint="0" symbolHeight="4" maxSymbolSize="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionLock="true" wrapChar="" rasterBorderWidth="0" symbolWidth="7" columnSpace="2" columnCount="1" excludeFromExports="0" resizeToContents="0" groupUuid="" frameJoinStyle="miter" equalColumnWidth="1" itemRotation="0" symbolAlignment="1" visibility="1" background="true" position="256.808,5.21277,mm" title="" boxSpace="2" positionOnPage="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}">
+      <LayoutItem symbolHeight="4" frame="true" position="256.808,5.21277,mm" boxSpace="2" columnCount="1" frameJoinStyle="miter" rasterBorderWidth="0" blendMode="0" legendFilterByAtlas="0" symbolAlignment="1" id="" zValue="11" wmsLegendWidth="50" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" excludeFromExports="0" rasterBorderColor="0,0,0,255" groupUuid="" columnSpace="2" opacity="1" wmsLegendHeight="25" equalColumnWidth="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" itemRotation="0" size="38.1563,53.7608,mm" maxSymbolSize="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" positionLock="true" outlineWidthM="0.3,mm" background="true" wrapChar="" splitLayer="0" title="" titleAlignment="1" visibility="1" resizeToContents="0" positionOnPage="256.808,5.21277,mm" referencePoint="0" minSymbolSize="0" symbolWidth="7">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30062,242 +30062,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="title" alignment="1">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="5.2333359999999995" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="group" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="5.2333359999999995" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="75" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="subgroup" alignment="1" marginTop="3">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="75" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="9" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="9" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="MM" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="4.5277799999999999" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
+            <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="4.5277799999999999" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="MM" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
               <families/>
-              <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-              <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-              <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-                <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+              <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+              <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+                <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                  <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                      <Option value="255,255,255,255" name="color" type="QString"/>
-                      <Option value="bevel" name="joinstyle" type="QString"/>
-                      <Option value="0,0" name="offset" type="QString"/>
-                      <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                      <Option value="MM" name="offset_unit" type="QString"/>
-                      <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                      <Option value="no" name="outline_style" type="QString"/>
-                      <Option value="0" name="outline_width" type="QString"/>
-                      <Option value="MM" name="outline_width_unit" type="QString"/>
-                      <Option value="solid" name="style" type="QString"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,0"/>
+                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="offset_unit" type="QString" value="MM"/>
+                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+              <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -30307,33 +30307,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Fencing and Cones">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" checked="Qt::Checked" expanded="1" name="Routes">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="" providerKey="ogr">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" expanded="1" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30341,77 +30341,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="10" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="148.46,6.45211,mm" valign="32" type="65641" labelText="CONES: [% &quot;name&quot; %]">
+      <LayoutItem templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,191.188,mm" valign="32" background="false" visibility="1" size="148.46,6.45211,mm" frame="false" frameJoinStyle="miter" labelText="CONES: [% &quot;name&quot; %]" type="65641" id="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" position="6.76779,191.188,mm" zValue="10" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="63" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="63" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem sectionY="0" position="182.723,191.188,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="9" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" hideBackgroundIfEmpty="0" opacity="1" sectionWidth="56.3557" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" sectionX="0" hidePageIfEmpty="0" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="56.3557,6.45237,mm" sectionHeight="5.76" type="65647" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}">
+      <LayoutItem templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" sectionWidth="56.3557" sectionX="0" hideBackgroundIfEmpty="0" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" background="false" visibility="1" size="56.3557,6.45237,mm" frame="false" frameJoinStyle="miter" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65647" sectionY="0" id="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" position="182.723,191.188,mm" hidePageIfEmpty="0" zValue="9" referencePoint="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30419,269 +30419,269 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="209.146,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="8" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginX="0" opacity="1" marginY="0" halign="2" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="26.8205,6.82826,mm" valign="32" type="65641" labelText="REVISION 3.0">
+      <LayoutItem templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="2" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="209.146,198.083,mm" valign="32" background="false" visibility="1" size="26.8205,6.82826,mm" frame="false" frameJoinStyle="miter" labelText="REVISION 3.0" type="65641" id="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" position="209.146,198.083,mm" zValue="8" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="62.6706,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="7" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginX="1" opacity="1" marginY="1" halign="1" referencePoint="0" groupUuid="" visibility="0" frame="false" outlineWidthM="0.3,mm" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="51.1638,7.07327,mm" valign="32" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" htmlState="0" marginX="1" marginY="1" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="62.6706,198.083,mm" valign="32" background="false" visibility="0" size="51.1638,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" type="65641" id="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" position="62.6706,198.083,mm" zValue="7" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="116.805,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="6" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="64.7594,7.10512,mm" valign="32" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+      <LayoutItem templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="116.805,198.083,mm" valign="32" background="false" visibility="1" size="64.7594,7.10512,mm" frame="false" frameJoinStyle="miter" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" type="65641" id="" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" position="116.805,198.083,mm" zValue="6" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem htmlState="0" position="6.76779,198.083,mm" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="5" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginX="0" opacity="1" marginY="0" halign="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="90.2083,7.07327,mm" valign="32" type="65641" labelText="Page [% @atlas_featurenumber %]">
+      <LayoutItem templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" htmlState="0" marginX="0" marginY="0" positionLock="true" opacity="1" halign="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.76779,198.083,mm" valign="32" background="false" visibility="1" size="90.2083,7.07327,mm" frame="false" frameJoinStyle="miter" labelText="Page [% @atlas_featurenumber %]" type="65641" id="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" position="6.76779,198.083,mm" zValue="5" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem northOffset="0" position="243.098,175.353,mm" mapUuid="" id="" positionLock="true" blendMode="0" excludeFromExports="0" pictureHeight="29.8354" zValue="4" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgBorderColor="0,0,0,255" anchorPoint="8" northMode="0" resizeMode="0" svgBorderWidth="0.2" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" background="false" itemRotation="0" file="../GunRun2022_250.png" size="49.3143,29.8354,mm" type="65640" pictureWidth="29.6535" pictureRotation="0" mode="1">
+      <LayoutItem templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgFillColor="255,255,255,255" file="../GunRun2022_250.png" mode="1" positionLock="true" opacity="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" anchorPoint="8" mapUuid="" positionOnPage="243.098,175.353,mm" pictureHeight="29.8354" background="false" visibility="1" size="49.3143,29.8354,mm" frame="false" frameJoinStyle="miter" type="65640" pictureRotation="0" svgBorderColor="0,0,0,255" northOffset="0" id="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" position="243.098,175.353,mm" resizeMode="0" zValue="4" referencePoint="0" northMode="0" pictureWidth="29.6535" svgBorderWidth="0.2" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30689,111 +30689,111 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem position="6.91779,197.79,mm" shapeType="1" id="" positionLock="true" blendMode="0" excludeFromExports="0" zValue="3" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" opacity="1" referencePoint="0" groupUuid="" visibility="1" frame="false" outlineWidthM="0.3,mm" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" background="false" itemRotation="0" size="232.01,0.14328,mm" type="65643">
+      <LayoutItem templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" opacity="1" shapeType="1" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" positionOnPage="6.91779,197.79,mm" background="false" visibility="1" size="232.01,0.14328,mm" frame="false" frameJoinStyle="miter" type="65643" cornerRadiusMeasure="0,mm" id="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" position="6.91779,197.79,mm" zValue="3" referencePoint="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" pass="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" enabled="1">
+          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" pass="0" locked="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" name="joinstyle" type="QString"/>
-              <Option value="0,0" name="offset" type="QString"/>
-              <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-              <Option value="MM" name="offset_unit" type="QString"/>
-              <Option value="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" type="65646" boxContentSpace="0.2" size="88.3204,15.8378,mm" numSubdivisions="1" frame="false" segmentSizeMode="1" segmentMillimeters="26.1864" lineCapStyle="square" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" id="" zValue="2" opacity="1" labelBarSpace="1" lineJoinStyle="round" style="Double Box" alignment="0" referencePoint="0" labelVerticalPlacement="0" positionLock="true" unitType="meters" numSegments="2" numMapUnitsPerScaleBarUnit="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" maxBarWidth="100" excludeFromExports="0" subdivisionsHeight="1.5" groupUuid="" frameJoinStyle="miter" labelHorizontalPlacement="0" numUnitsPerSegment="30" itemRotation="0" minBarWidth="25" height="2" unitLabel="m" numSegmentsLeft="2" visibility="1" background="false" position="6.76779,2.8482,mm" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}">
+      <LayoutItem numSegmentsLeft="2" lineJoinStyle="round" numSubdivisions="1" frame="false" position="6.76779,2.8482,mm" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" labelBarSpace="1" blendMode="0" id="" height="2" numSegments="2" zValue="2" maxBarWidth="100" excludeFromExports="0" boxContentSpace="0.2" unitLabel="m" groupUuid="" lineCapStyle="square" minBarWidth="25" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="1" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" itemRotation="0" segmentSizeMode="1" size="88.3204,15.8378,mm" unitType="meters" style="Double Box" subdivisionsHeight="1.5" segmentMillimeters="26.1864" labelVerticalPlacement="0" numUnitsPerSegment="30" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" type="65646" positionLock="true" outlineWidthM="0.3,mm" background="false" visibility="1" positionOnPage="6.76779,2.8482,mm" outlineWidth="0.2" alignment="0" referencePoint="0" labelHorizontalPlacement="0">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="12" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+        <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="12" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-          <text-mask maskSize="0" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-          <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-            <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+          <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0"/>
+          <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+            <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+              <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,255" name="color" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
@@ -30801,268 +30801,268 @@ def my_form_open(dialog, layer, feature):
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
         <fillColor green="0" blue="0" alpha="255" red="0"/>
         <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{ba8b697f-af10-49bc-b789-55678d099479}" enabled="1">
+            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" enabled="1">
+            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" pass="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" enabled="1">
+            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" pass="0" locked="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" enabled="1">
+            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" pass="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" enabled="1">
+            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" pass="0" locked="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem position="6.76779,9.35102,mm" id="" positionLock="true" blendMode="0" followPresetName="Cones" excludeFromExports="0" drawCanvasItems="false" zValue="1" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" referencePoint="0" groupUuid="" visibility="1" frame="false" labelMargin="0,mm" outlineWidthM="0.3,mm" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" background="false" mapRotation="0" itemRotation="0" keepLayerSet="false" size="283.418,180.92,mm" isTemporal="0" mapFlags="0" type="65639" followPreset="true">
+      <LayoutItem templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" labelMargin="0,mm" positionLock="true" opacity="0.9" itemRotation="0" groupUuid="" excludeFromExports="0" blendMode="0" drawCanvasItems="false" mapFlags="0" positionOnPage="6.76779,9.35102,mm" background="false" visibility="1" size="283.418,180.92,mm" frame="false" frameJoinStyle="miter" keepLayerSet="false" type="65639" followPreset="true" followPresetName="Cones" id="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" position="6.76779,9.35102,mm" zValue="1" referencePoint="0" isTemporal="0" mapRotation="0" outlineWidthM="0.3,mm">
         <FrameColor green="0" blue="0" alpha="255" red="0"/>
         <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
                   <Option name="transformer" type="Map">
                     <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
                 <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92052446432401069" xmax="18.3837273348683965" xmin="18.38081056635935795" ymax="-33.91866254684331494"/>
+        <Extent xmax="18.3837273348683965" xmin="18.38081056635935795" ymin="-33.92052446432401069" ymax="-33.91866254684331494"/>
         <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>
@@ -31077,92 +31077,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationDisplay="3" blendMode="0" rotatedTicksMarginToCorner="0" rightFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" gridFramePenThickness="0.5" leftFrameDivisions="0" intervalY="5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationFormat="4" crossLength="3" leftAnnotationDirection="0" bottomAnnotationDirection="0" topAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topFrameDivisions="0" rotatedTicksEnabled="0" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDisplay="3" gridStyle="0" showAnnotation="0" rotatedAnnotationsEnabled="0" offsetY="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" topAnnotationDisplay="3" show="0" gridFrameWidth="2" unit="1" name="Grid 1" rightAnnotationPosition="1" leftAnnotationPosition="1" gridFrameStyle="0" gridFrameMargin="0" frameAnnotationDistance="1" annotationPrecision="3" frameFillColor2="0,0,0,255" intervalX="5" offsetX="0" position="3" bottomAnnotationDisplay="3" annotationExpression="" rotatedTicksMinimumAngle="0" minimumIntervalWidth="50" topAnnotationDirection="0" maximumIntervalWidth="100">
+        <ComposerMapGrid leftFrameDivisions="0" minimumIntervalWidth="50" annotationPrecision="3" bottomAnnotationPosition="1" position="3" intervalY="5" blendMode="0" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" annotationExpression="" leftAnnotationPosition="1" offsetY="0" topAnnotationDirection="0" intervalX="5" rightFrameDivisions="0" topAnnotationPosition="1" frameAnnotationDistance="1" gridFrameMargin="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationDisplay="3" topAnnotationDisplay="3" unit="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" crossLength="3" gridFrameStyle="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" annotationFormat="4" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" gridFrameSideFlags="15" rotatedAnnotationsLengthMode="0" rotatedTicksLengthMode="0" offsetX="0" bottomAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" gridStyle="0" showAnnotation="0" name="Grid 1" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" show="0" rightAnnotationDirection="0" leftAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" leftAnnotationDisplay="3" rotatedTicksEnabled="0">
           <lineStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="line" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" pass="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" enabled="1">
+              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" pass="0" locked="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                  <Option value="0" name="draw_inside_polygon" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" name="line_width" type="QString"/>
-                  <Option value="MM" name="line_width_unit" type="QString"/>
-                  <Option value="0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0" name="ring_filter" type="QString"/>
-                  <Option value="0" name="trim_distance_end" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                  <Option value="0" name="trim_distance_start" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                  <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                  <Option value="0" name="use_custom_dash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" is_animated="0" name="" force_rhr="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol alpha="1" name="" is_animated="0" force_rhr="0" type="marker" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" pass="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" enabled="1">
+              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" pass="0" locked="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" name="name" type="QString"/>
-                  <Option value="0,0" name="offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="offset_unit" type="QString"/>
-                  <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="diameter" name="scale_method" type="QString"/>
-                  <Option value="2" name="size" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="size_unit" type="QString"/>
-                  <Option value="1" name="vertical_anchor_point" type="QString"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31179,58 +31179,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontLetterSpacing="0" fontItalic="0" multilineHeightUnit="Percentage" previewBkgrdColor="255,255,255,255" forcedBold="0" textColor="0,0,0,255" blendMode="0" multilineHeight="1" fontStrikeout="0" fontWordSpacing="0" fontSizeUnit="Point" fontKerning="1" forcedItalic="0" textOpacity="1" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" capitalization="0" fontSize="10" fontWeight="50" fontUnderline="0" namedStyle="" fontFamily="Myriad Pro">
+          <text-style namedStyle="" capitalization="0" fontKerning="1" fontUnderline="0" fontItalic="0" allowHtml="0" blendMode="0" previewBkgrdColor="255,255,255,255" fontSize="10" multilineHeight="1" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" forcedBold="0" forcedItalic="0" fontFamily="Myriad Pro" fontWeight="50" textOpacity="1" multilineHeightUnit="Percentage" textOrientation="horizontal" fontWordSpacing="0" fontStrikeout="0" textColor="0,0,0,255">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1"/>
-            <text-mask maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskEnabled="0"/>
-            <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeSizeType="0" shapeType="0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeDraw="0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeY="0">
-              <symbol frame_rate="10" is_animated="0" name="fillSymbol" force_rhr="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1"/>
+            <text-mask maskedSymbolLayers="" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskOpacity="1" maskType="0"/>
+            <background shapeSizeType="0" shapeSizeX="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRotationType="0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeSVGFile="" shapeRadiiUnit="MM" shapeOffsetY="0" shapeFillColor="255,255,255,255">
+              <symbol alpha="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" pass="0" id="" enabled="1">
+                <layer id="" pass="0" locked="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="0,0" name="offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetAngle="135" shadowRadius="1.5" shadowDraw="0" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowScale="100"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31238,21 +31238,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheetEnabled="true" contentMode="1" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" maxBreakDistance="10" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+      <LayoutMultiFrame contentMode="1" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" useSmartBreaks="true" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" url="" resizeMode="0" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" evaluateExpressions="true" maxBreakDistance="10">
+        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31262,30 +31262,30 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_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" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_only_groups" sortKey="&quot;group&quot;" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" 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" enabled="1"/>
+      <Atlas sortKey="&quot;group&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="cone_only_groups" pageNameExpression="&quot;name&quot;" coverageLayerProvider="virtual" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -31293,7 +31293,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.91820021920908346" xmax="18.43886703005560435" xmin="18.39963413089022737" ymax="-33.89691320746838699">
+    <DefaultViewExtent xmax="18.44846010669025915" xmin="18.3699943083595123" ymin="-33.93871522874037794" ymax="-33.896141205258985">
       <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>
@@ -31307,40 +31307,40 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
         <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
         <Option name="decimal_separator" type="invalid"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
         <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
@@ -31358,7 +31358,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="route_markers" destinationLayer="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" destinationLayerSource="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)&amp;uid={cdc3d1cc-0fee-4cd6-8469-fbf7aeabfb6a}" destinationLayerProvider="memory" autoAddTrackVertices="0">
+  <ProjectGpsSettings destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" destinationLayerProvider="ogr" destinationLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" autoCommitFeatures="0" autoAddTrackVertices="0" destinationFollowsActiveLayer="1" destinationLayerName="marshal_overviews">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/marshal overviews.dbf b/GIS Base Map/marshal overviews.dbf
index 373f751..67f16ea 100644
Binary files a/GIS Base Map/marshal overviews.dbf and b/GIS Base Map/marshal overviews.dbf differ
diff --git a/GIS Base Map/marshal overviews.shp b/GIS Base Map/marshal overviews.shp
index 19b185d..b7187b8 100644
Binary files a/GIS Base Map/marshal overviews.shp and b/GIS Base Map/marshal overviews.shp differ
diff --git a/GIS Base Map/marshal overviews.shx b/GIS Base Map/marshal overviews.shx
index e5e77d1..9cfd84c 100644
Binary files a/GIS Base Map/marshal overviews.shx and b/GIS Base Map/marshal overviews.shx differ
diff --git a/create_index.py b/create_index.py
index 9c61b29..fbd818d 100755
--- a/create_index.py
+++ b/create_index.py
@@ -35,7 +35,7 @@ for root, dirs, files in os.walk(webfile_dir):
             date = m.group(1)
             name = m.group(2) + m.group(3)
             current = most_recent.get(name)
-            if current is None or date > current.get('date'):
+            if current is None or date >= current.get('date'):
                 most_recent[name] = { 'date': date, 'file': file }
 
     for k, v in most_recent.items():